diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 09cc17ce1a..65c5f9c8d5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,20 @@ KiCad ChangeLog 2010
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2011-Jan-21 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
+================================================================================
+  EESchema code refactoring and coding policy naming fixes.
+
+  * Move schematic wire and bus break code into schematic screen object.
+  * Move schematic test for dangling ends into schematic screen object.
+  * Remove left over debugging output in schematic screen object.
+  * Remove unused file eeschema/cleanup.cpp.
+  * Fix bug in schematic line object hit test algorithm.
+  * Fix a string concatenation compile error added in r2752.
+  * Rename class WinEDA_BasicFrame to EDA_BASE_FRAME.
+  * Rename class WinEDA_DrawFrame to EDA_DRAW_FRAME.
+  * Rename class WinEDA_DrawPanel to EDA_DRAW_PANEL.
+
 2011-Jan-19 UPDATE Dick Hollenbeck <dick@softplc.com>
 ================================================================================
 ++all:
diff --git a/common/dialogs/dialog_hotkeys_editor_base.fbp b/common/dialogs/dialog_hotkeys_editor_base.fbp
index 91b99b4c72..060e265718 100644
--- a/common/dialogs/dialog_hotkeys_editor_base.fbp
+++ b/common/dialogs/dialog_hotkeys_editor_base.fbp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="9" />
+    <FileVersion major="1" minor="10" />
     <object class="Project" expanded="1">
-        <property name="class_decoration"></property>
+        <property name="class_decoration" />
         <property name="code_generation">C++</property>
         <property name="disconnect_events">1</property>
         <property name="encoding">UTF-8</property>
@@ -12,66 +12,66 @@
         <property name="help_provider">none</property>
         <property name="internationalize">1</property>
         <property name="name">dialog_hotkeys_editor_base</property>
-        <property name="namespace"></property>
+        <property name="namespace" />
         <property name="path">.</property>
-        <property name="precompiled_header"></property>
+        <property name="precompiled_header" />
         <property name="relative_path">1</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
-            <property name="bg"></property>
-            <property name="center"></property>
-            <property name="context_help"></property>
+            <property name="bg" />
+            <property name="center" />
+            <property name="context_help" />
             <property name="enabled">1</property>
-            <property name="extra_style"></property>
-            <property name="fg"></property>
-            <property name="font"></property>
+            <property name="extra_style" />
+            <property name="fg" />
+            <property name="font" />
             <property name="hidden">0</property>
             <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
+            <property name="maximum_size" />
+            <property name="minimum_size" />
             <property name="name">HOTKEYS_EDITOR_DIALOG_BASE</property>
-            <property name="pos"></property>
+            <property name="pos" />
             <property name="size">304,235</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
-            <property name="subclass"></property>
+            <property name="subclass" />
             <property name="title">Hotkeys Editor</property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
+            <property name="tooltip" />
+            <property name="window_extra_style" />
+            <property name="window_name" />
+            <property name="window_style" />
+            <event name="OnActivate" />
+            <event name="OnActivateApp" />
+            <event name="OnChar" />
+            <event name="OnClose" />
+            <event name="OnEnterWindow" />
+            <event name="OnEraseBackground" />
+            <event name="OnHibernate" />
+            <event name="OnIconize" />
+            <event name="OnIdle" />
+            <event name="OnInitDialog" />
+            <event name="OnKeyDown" />
+            <event name="OnKeyUp" />
+            <event name="OnKillFocus" />
+            <event name="OnLeaveWindow" />
+            <event name="OnLeftDClick" />
+            <event name="OnLeftDown" />
+            <event name="OnLeftUp" />
+            <event name="OnMiddleDClick" />
+            <event name="OnMiddleDown" />
+            <event name="OnMiddleUp" />
+            <event name="OnMotion" />
+            <event name="OnMouseEvents" />
+            <event name="OnMouseWheel" />
+            <event name="OnPaint" />
+            <event name="OnRightDClick" />
+            <event name="OnRightDown" />
+            <event name="OnRightUp" />
+            <event name="OnSetFocus" />
+            <event name="OnSize" />
+            <event name="OnUpdateUI" />
             <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
+                <property name="minimum_size" />
                 <property name="name">bMainSizer</property>
                 <property name="orient">wxHORIZONTAL</property>
                 <property name="permission">none</property>
@@ -82,108 +82,108 @@
                     <object class="wxGrid" expanded="1">
                         <property name="autosize_cols">1</property>
                         <property name="autosize_rows">0</property>
-                        <property name="bg"></property>
-                        <property name="cell_bg"></property>
-                        <property name="cell_font"></property>
+                        <property name="bg" />
+                        <property name="cell_bg" />
+                        <property name="cell_font" />
                         <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
-                        <property name="cell_text"></property>
+                        <property name="cell_text" />
                         <property name="cell_vert_alignment">wxALIGN_TOP</property>
                         <property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
                         <property name="col_label_size">30</property>
-                        <property name="col_label_values"></property>
+                        <property name="col_label_values" />
                         <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
                         <property name="cols">2</property>
-                        <property name="column_sizes"></property>
-                        <property name="context_help"></property>
+                        <property name="column_sizes" />
+                        <property name="context_help" />
                         <property name="drag_col_move">0</property>
                         <property name="drag_col_size">1</property>
                         <property name="drag_grid_size">0</property>
                         <property name="drag_row_size">1</property>
                         <property name="editing">0</property>
                         <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="font"></property>
-                        <property name="grid_line_color"></property>
+                        <property name="fg" />
+                        <property name="font" />
+                        <property name="grid_line_color" />
                         <property name="grid_lines">1</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
-                        <property name="label_bg"></property>
-                        <property name="label_font"></property>
-                        <property name="label_text"></property>
+                        <property name="label_bg" />
+                        <property name="label_font" />
+                        <property name="label_text" />
                         <property name="margin_height">0</property>
                         <property name="margin_width">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="minimum_size"></property>
+                        <property name="maximum_size" />
+                        <property name="minimum_size" />
                         <property name="name">m_hotkeyGrid</property>
                         <property name="permission">protected</property>
-                        <property name="pos"></property>
+                        <property name="pos" />
                         <property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
                         <property name="row_label_size">0</property>
-                        <property name="row_label_values"></property>
+                        <property name="row_label_values" />
                         <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
-                        <property name="row_sizes"></property>
+                        <property name="row_sizes" />
                         <property name="rows">1</property>
-                        <property name="size"></property>
-                        <property name="subclass"></property>
-                        <property name="tooltip"></property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
+                        <property name="size" />
+                        <property name="subclass" />
+                        <property name="tooltip" />
+                        <property name="window_extra_style" />
+                        <property name="window_name" />
                         <property name="window_style">wxDOUBLE_BORDER|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
                         <event name="OnChar">OnKeyPressed</event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnGridCellChange"></event>
-                        <event name="OnGridCellLeftClick"></event>
-                        <event name="OnGridCellLeftDClick"></event>
+                        <event name="OnEnterWindow" />
+                        <event name="OnEraseBackground" />
+                        <event name="OnGridCellChange" />
+                        <event name="OnGridCellLeftClick" />
+                        <event name="OnGridCellLeftDClick" />
                         <event name="OnGridCellRightClick">OnRightClickOnCell</event>
-                        <event name="OnGridCellRightDClick"></event>
-                        <event name="OnGridCmdCellChange"></event>
-                        <event name="OnGridCmdCellLeftClick"></event>
-                        <event name="OnGridCmdCellLeftDClick"></event>
-                        <event name="OnGridCmdCellRightClick"></event>
-                        <event name="OnGridCmdCellRightDClick"></event>
-                        <event name="OnGridCmdColSize"></event>
-                        <event name="OnGridCmdEditorCreated"></event>
-                        <event name="OnGridCmdEditorHidden"></event>
-                        <event name="OnGridCmdEditorShown"></event>
-                        <event name="OnGridCmdLabelLeftClick"></event>
-                        <event name="OnGridCmdLabelLeftDClick"></event>
-                        <event name="OnGridCmdLabelRightClick"></event>
-                        <event name="OnGridCmdLabelRightDClick"></event>
-                        <event name="OnGridCmdRangeSelect"></event>
-                        <event name="OnGridCmdRowSize"></event>
-                        <event name="OnGridCmdSelectCell"></event>
-                        <event name="OnGridColSize"></event>
-                        <event name="OnGridEditorCreated"></event>
-                        <event name="OnGridEditorHidden"></event>
-                        <event name="OnGridEditorShown"></event>
-                        <event name="OnGridLabelLeftClick"></event>
-                        <event name="OnGridLabelLeftDClick"></event>
-                        <event name="OnGridLabelRightClick"></event>
-                        <event name="OnGridLabelRightDClick"></event>
-                        <event name="OnGridRangeSelect"></event>
-                        <event name="OnGridRowSize"></event>
+                        <event name="OnGridCellRightDClick" />
+                        <event name="OnGridCmdCellChange" />
+                        <event name="OnGridCmdCellLeftClick" />
+                        <event name="OnGridCmdCellLeftDClick" />
+                        <event name="OnGridCmdCellRightClick" />
+                        <event name="OnGridCmdCellRightDClick" />
+                        <event name="OnGridCmdColSize" />
+                        <event name="OnGridCmdEditorCreated" />
+                        <event name="OnGridCmdEditorHidden" />
+                        <event name="OnGridCmdEditorShown" />
+                        <event name="OnGridCmdLabelLeftClick" />
+                        <event name="OnGridCmdLabelLeftDClick" />
+                        <event name="OnGridCmdLabelRightClick" />
+                        <event name="OnGridCmdLabelRightDClick" />
+                        <event name="OnGridCmdRangeSelect" />
+                        <event name="OnGridCmdRowSize" />
+                        <event name="OnGridCmdSelectCell" />
+                        <event name="OnGridColSize" />
+                        <event name="OnGridEditorCreated" />
+                        <event name="OnGridEditorHidden" />
+                        <event name="OnGridEditorShown" />
+                        <event name="OnGridLabelLeftClick" />
+                        <event name="OnGridLabelLeftDClick" />
+                        <event name="OnGridLabelRightClick" />
+                        <event name="OnGridLabelRightDClick" />
+                        <event name="OnGridRangeSelect" />
+                        <event name="OnGridRowSize" />
                         <event name="OnGridSelectCell">OnClickOnCell</event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
+                        <event name="OnKeyDown" />
+                        <event name="OnKeyUp" />
+                        <event name="OnKillFocus" />
+                        <event name="OnLeaveWindow" />
+                        <event name="OnLeftDClick" />
+                        <event name="OnLeftDown" />
+                        <event name="OnLeftUp" />
+                        <event name="OnMiddleDClick" />
+                        <event name="OnMiddleDown" />
+                        <event name="OnMiddleUp" />
+                        <event name="OnMotion" />
+                        <event name="OnMouseEvents" />
+                        <event name="OnMouseWheel" />
+                        <event name="OnPaint" />
+                        <event name="OnRightDClick" />
+                        <event name="OnRightDown" />
+                        <event name="OnRightUp" />
+                        <event name="OnSetFocus" />
+                        <event name="OnSize" />
+                        <event name="OnUpdateUI" />
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
@@ -191,7 +191,7 @@
                     <property name="flag">wxALIGN_CENTER_VERTICAL</property>
                     <property name="proportion">0</property>
                     <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
+                        <property name="minimum_size" />
                         <property name="name">b_buttonsSizer</property>
                         <property name="orient">wxVERTICAL</property>
                         <property name="permission">none</property>
@@ -200,51 +200,51 @@
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
                             <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
+                                <property name="bg" />
+                                <property name="context_help" />
                                 <property name="default">0</property>
                                 <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
+                                <property name="fg" />
+                                <property name="font" />
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_OK</property>
                                 <property name="label">OK</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
+                                <property name="maximum_size" />
+                                <property name="minimum_size" />
                                 <property name="name">m_OKButton</property>
                                 <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
+                                <property name="pos" />
+                                <property name="size" />
+                                <property name="style" />
+                                <property name="subclass" />
+                                <property name="tooltip" />
+                                <property name="window_extra_style" />
+                                <property name="window_name" />
+                                <property name="window_style" />
                                 <event name="OnButtonClick">OnOKClicked</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
+                                <event name="OnChar" />
+                                <event name="OnEnterWindow" />
+                                <event name="OnEraseBackground" />
+                                <event name="OnKeyDown" />
+                                <event name="OnKeyUp" />
+                                <event name="OnKillFocus" />
+                                <event name="OnLeaveWindow" />
+                                <event name="OnLeftDClick" />
+                                <event name="OnLeftDown" />
+                                <event name="OnLeftUp" />
+                                <event name="OnMiddleDClick" />
+                                <event name="OnMiddleDown" />
+                                <event name="OnMiddleUp" />
+                                <event name="OnMotion" />
+                                <event name="OnMouseEvents" />
+                                <event name="OnMouseWheel" />
+                                <event name="OnPaint" />
+                                <event name="OnRightDClick" />
+                                <event name="OnRightDown" />
+                                <event name="OnRightUp" />
+                                <event name="OnSetFocus" />
+                                <event name="OnSize" />
+                                <event name="OnUpdateUI" />
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -252,51 +252,51 @@
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
                             <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
+                                <property name="bg" />
+                                <property name="context_help" />
                                 <property name="default">0</property>
                                 <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
+                                <property name="fg" />
+                                <property name="font" />
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="label">Close</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
+                                <property name="maximum_size" />
+                                <property name="minimum_size" />
                                 <property name="name"> m_cancelButton</property>
                                 <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
+                                <property name="pos" />
+                                <property name="size" />
+                                <property name="style" />
+                                <property name="subclass" />
+                                <property name="tooltip" />
+                                <property name="window_extra_style" />
+                                <property name="window_name" />
+                                <property name="window_style" />
                                 <event name="OnButtonClick">CancelClicked</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
+                                <event name="OnChar" />
+                                <event name="OnEnterWindow" />
+                                <event name="OnEraseBackground" />
+                                <event name="OnKeyDown" />
+                                <event name="OnKeyUp" />
+                                <event name="OnKillFocus" />
+                                <event name="OnLeaveWindow" />
+                                <event name="OnLeftDClick" />
+                                <event name="OnLeftDown" />
+                                <event name="OnLeftUp" />
+                                <event name="OnMiddleDClick" />
+                                <event name="OnMiddleDown" />
+                                <event name="OnMiddleUp" />
+                                <event name="OnMotion" />
+                                <event name="OnMouseEvents" />
+                                <event name="OnMouseWheel" />
+                                <event name="OnPaint" />
+                                <event name="OnRightDClick" />
+                                <event name="OnRightDown" />
+                                <event name="OnRightUp" />
+                                <event name="OnSetFocus" />
+                                <event name="OnSize" />
+                                <event name="OnUpdateUI" />
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
@@ -304,51 +304,51 @@
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
                             <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
+                                <property name="bg" />
+                                <property name="context_help" />
                                 <property name="default">0</property>
                                 <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
+                                <property name="fg" />
+                                <property name="font" />
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_CANCEL</property>
                                 <property name="label">Undo</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
+                                <property name="maximum_size" />
+                                <property name="minimum_size" />
                                 <property name="name">m_undoButton</property>
                                 <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
+                                <property name="pos" />
+                                <property name="size" />
+                                <property name="style" />
+                                <property name="subclass" />
+                                <property name="tooltip" />
+                                <property name="window_extra_style" />
+                                <property name="window_name" />
+                                <property name="window_style" />
                                 <event name="OnButtonClick">UndoClicked</event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
+                                <event name="OnChar" />
+                                <event name="OnEnterWindow" />
+                                <event name="OnEraseBackground" />
+                                <event name="OnKeyDown" />
+                                <event name="OnKeyUp" />
+                                <event name="OnKillFocus" />
+                                <event name="OnLeaveWindow" />
+                                <event name="OnLeftDClick" />
+                                <event name="OnLeftDown" />
+                                <event name="OnLeftUp" />
+                                <event name="OnMiddleDClick" />
+                                <event name="OnMiddleDown" />
+                                <event name="OnMiddleUp" />
+                                <event name="OnMotion" />
+                                <event name="OnMouseEvents" />
+                                <event name="OnMouseWheel" />
+                                <event name="OnPaint" />
+                                <event name="OnRightDClick" />
+                                <event name="OnRightDown" />
+                                <event name="OnRightUp" />
+                                <event name="OnSetFocus" />
+                                <event name="OnSize" />
+                                <event name="OnUpdateUI" />
                             </object>
                         </object>
                     </object>
diff --git a/demos/interf_u/interf_u-cache.lib b/demos/interf_u/interf_u-cache.lib
index 4eabf5c7bc..abe5eef66f 100644
--- a/demos/interf_u/interf_u-cache.lib
+++ b/demos/interf_u/interf_u-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 19/08/2010 20:44:23
+EESchema-LIBRARY Version 2.3  Date: 07/12/2010 12:09:24
 #
 # 4003APG120
 #
diff --git a/demos/interf_u/interf_u.cmp b/demos/interf_u/interf_u.cmp
index fd38e2e546..4dd66d05a8 100644
--- a/demos/interf_u/interf_u.cmp
+++ b/demos/interf_u/interf_u.cmp
@@ -1,171 +1,171 @@
-Cmp-Mod V01 Created by Cvpcb (20080731.r1175 date = 1/8/2008-07:52:43
-
-BeginCmp
-TimeStamp = /322D3011;
-Reference = BUS1;
-ValeurCmp = BUSPC;
-IdModule  = BUS_PC;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DE2;
-Reference = C1;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307ECF;
-Reference = C2;
-ValeurCmp = 47pF;
-IdModule  = C1;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307ED4;
-Reference = C3;
-ValeurCmp = 47pF;
-IdModule  = C1;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DCF;
-Reference = C4;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DCA;
-Reference = C5;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307DC0;
-Reference = C6;
-ValeurCmp = 47uF;
-IdModule  = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32AC;
-Reference = D1;
-ValeurCmp = LED;
-IdModule  = LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32BE;
-Reference = D2;
-ValeurCmp = LED;
-IdModule  = LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /32568D1E;
-Reference = JP1;
-ValeurCmp = CONN_8X2;
-IdModule  = pin_array_8x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /3256759C;
-Reference = P1;
-ValeurCmp = DB25FEMELLE;
-IdModule  = DB25FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307EA1;
-Reference = R1;
-ValeurCmp = 100K;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307EAA;
-Reference = R2;
-ValeurCmp = 1K;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /324002E6;
-Reference = R3;
-ValeurCmp = 10K;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D3295;
-Reference = R4;
-ValeurCmp = 330;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32A0;
-Reference = R5;
-ValeurCmp = 330;
-IdModule  = R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /325679C1;
-Reference = RR1;
-ValeurCmp = 9x1K;
-IdModule  = r_pack9;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D31F4;
-Reference = U1;
-ValeurCmp = 74LS245;
-IdModule  = 20dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D35B4;
-Reference = U2;
-ValeurCmp = 74LS688;
-IdModule  = 20dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D31CA;
-Reference = U3;
-ValeurCmp = 74LS541;
-IdModule  = 20dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /3240023F;
-Reference = U5;
-ValeurCmp = 628128;
-IdModule  = 32dip600;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D321C;
-Reference = U8;
-ValeurCmp = EP600;
-IdModule  = 24dip300;
-EndCmp
-
-BeginCmp
-TimeStamp = /322D32FA;
-Reference = U9;
-ValeurCmp = 4003APG120;
-IdModule  = PGA120;
-EndCmp
-
-BeginCmp
-TimeStamp = /32307EC0;
-Reference = X1;
-ValeurCmp = 8MHz;
-IdModule  = HC-18UH;
-EndCmp
-
-EndListe
+Cmp-Mod V01 Genere par PcbNew le 17/01/2011 13:55:19
+
+BeginCmp
+TimeStamp = /322D3011;
+Reference = BUS1;
+ValeurCmp = BUSPC;
+IdModule  = BUS_PC;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307DE2;
+Reference = C1;
+ValeurCmp = 47uF;
+IdModule  = CP6;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307ECF;
+Reference = C2;
+ValeurCmp = 47pF;
+IdModule  = C1;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307ED4;
+Reference = C3;
+ValeurCmp = 47pF;
+IdModule  = C1;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307DCF;
+Reference = C4;
+ValeurCmp = 47uF;
+IdModule  = CP6;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307DCA;
+Reference = C5;
+ValeurCmp = 47uF;
+IdModule  = CP6;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307DC0;
+Reference = C6;
+ValeurCmp = 47uF;
+IdModule  = CP6;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D32AC;
+Reference = D1;
+ValeurCmp = LED;
+IdModule  = LEDV;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D32BE;
+Reference = D2;
+ValeurCmp = LED;
+IdModule  = LEDV;
+EndCmp
+
+BeginCmp
+TimeStamp = /32568D1E;
+Reference = JP1;
+ValeurCmp = CONN_8X2;
+IdModule  = pin_array_8x2;
+EndCmp
+
+BeginCmp
+TimeStamp = /3256759C;
+Reference = P1;
+ValeurCmp = DB25FEMELLE;
+IdModule  = DB25FC;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307EA1;
+Reference = R1;
+ValeurCmp = 100K;
+IdModule  = R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307EAA;
+Reference = R2;
+ValeurCmp = 1K;
+IdModule  = R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /324002E6;
+Reference = R3;
+ValeurCmp = 10K;
+IdModule  = R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D3295;
+Reference = R4;
+ValeurCmp = 330;
+IdModule  = R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D32A0;
+Reference = R5;
+ValeurCmp = 330;
+IdModule  = R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /325679C1;
+Reference = RR1;
+ValeurCmp = 9x1K;
+IdModule  = r_pack9;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D31F4;
+Reference = U1;
+ValeurCmp = 74LS245;
+IdModule  = 20dip300;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D35B4;
+Reference = U2;
+ValeurCmp = 74LS688;
+IdModule  = 20dip300;
+EndCmp
+
+BeginCmp
+TimeStamp = /4A087146;
+Reference = U3;
+ValeurCmp = 74LS541;
+IdModule  = 20dip300;
+EndCmp
+
+BeginCmp
+TimeStamp = /3240023F;
+Reference = U5;
+ValeurCmp = 628128;
+IdModule  = DIP-32__600;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D321C;
+Reference = U8;
+ValeurCmp = EP600;
+IdModule  = 24dip300;
+EndCmp
+
+BeginCmp
+TimeStamp = /322D32FA;
+Reference = U9;
+ValeurCmp = 4003APG120;
+IdModule  = PGA120;
+EndCmp
+
+BeginCmp
+TimeStamp = /32307EC0;
+Reference = X1;
+ValeurCmp = 8MHz;
+IdModule  = HC-18UH;
+EndCmp
+
+EndListe
diff --git a/demos/interf_u/interf_u.net b/demos/interf_u/interf_u.net
index 58f12bb966..3c9ba55930 100644
--- a/demos/interf_u/interf_u.net
+++ b/demos/interf_u/interf_u.net
@@ -1,933 +1,510 @@
-# EESchema Netlist Version 1.1 created  sam. 13 nov. 2010 22:07:01 CET
-(
- ( /4A087146 $noname  U3 74LS541 {Lib=74LS541}
-  (    1 GND )
-  (    2 /PC-A1 )
-  (    3 /PC-A0 )
-  (    4 /PC-A2 )
-  (    5 /PC-A3 )
-  (    6 /PC-IOW )
-  (    7 /PC-IOR )
-  (    8 /PC-RST )
-  (    9 /PC-RST )
-  (   10 GND )
-  (   11 ? )
-  (   12 /RSTL )
-  (   13 /PC-RD )
-  (   14 /PC-WR )
-  (   15 N-000109 )
-  (   16 N-000108 )
-  (   17 N-000107 )
-  (   18 N-000106 )
-  (   19 GND )
-  (   20 VCC )
- )
- ( /32568D1E pin_array_8x2  JP1 CONN_8X2 {Lib=CONN_8X2}
-  (    1 GND )
-  (    2 /REF10 )
-  (    3 GND )
-  (    4 /REF11 )
-  (    5 GND )
-  (    6 /REF7 )
-  (    7 GND )
-  (    8 /REF9 )
-  (    9 GND )
-  (   10 /REF6 )
-  (   11 GND )
-  (   12 /REF8 )
-  (   13 GND )
-  (   14 /REF4 )
-  (   15 GND )
-  (   16 /REF5 )
- )
- ( /325679C1 r_pack9  RR1 9x1K {Lib=RR9}
-  (    1 VCC )
-  (    2 /REF5 )
-  (    3 /REF4 )
-  (    4 /REF8 )
-  (    5 /REF6 )
-  (    6 /REF9 )
-  (    7 /REF7 )
-  (    8 /REF11 )
-  (    9 /REF10 )
-  (   10 ? )
- )
- ( /3256759C DB25FC  P1 DB25FEMELLE {Lib=DB25}
-  (    1 /STROBE )
-  (    2 /BIT0 )
-  (    3 /BIT1 )
-  (    4 /BIT2 )
-  (    5 /BIT3 )
-  (    6 /BIT4 )
-  (    7 /BIT5 )
-  (    8 /BIT6 )
-  (    9 /BIT7 )
-  (   10 /ACK )
-  (   11 /BUST+ )
-  (   12 /PE+ )
-  (   13 /SLCT+ )
-  (   14 /AUTOFD- )
-  (   15 /ERROR- )
-  (   16 /INIT- )
-  (   17 /SLCTIN- )
-  (   18 GND )
-  (   19 GND )
-  (   20 GND )
-  (   21 GND )
-  (   22 GND )
-  (   23 GND )
-  (   24 GND )
-  (   25 GND )
- )
- ( /324002E6 R3  R3 10K {Lib=R}
-  (    1 N-000071 )
-  (    2 VCC )
- )
- ( /3240023F 32dip600  U5 628128 {Lib=628128}
-  (    2 /MA16 )
-  (    3 /MA14 )
-  (    4 /MA12 )
-  (    5 /MA7 )
-  (    6 /MA6 )
-  (    7 /MA5 )
-  (    8 /MA4 )
-  (    9 /MA3 )
-  (   10 /MA2 )
-  (   11 /MA1 )
-  (   12 /MA0 )
-  (   13 /MD0 )
-  (   14 /MD1 )
-  (   15 /MD2 )
-  (   16 GND )
-  (   17 /MD3 )
-  (   18 /MD4 )
-  (   19 /MD5 )
-  (   20 /MD6 )
-  (   21 /MD7 )
-  (   22 /CS1- )
-  (   23 /MA10 )
-  (   24 /OE- )
-  (   25 /MA11 )
-  (   26 /MA9 )
-  (   27 /MA8 )
-  (   28 /MA13 )
-  (   29 /WR- )
-  (   30 N-000071 )
-  (   31 /MA15 )
-  (   32 VCC )
- )
- ( /32307ED4 C1  C3 47pF {Lib=C}
-  (    1 N-000146 )
-  (    2 GND )
- )
- ( /32307ECF C1  C2 47pF {Lib=C}
-  (    1 N-000145 )
-  (    2 GND )
- )
- ( /32307EC0 HC-18UH  X1 8MHz {Lib=CRYSTAL}
-  (    1 N-000145 )
-  (    2 N-000146 )
- )
- ( /32307EAA R3  R2 1K {Lib=R}
-  (    1 /8MH-OUT )
-  (    2 N-000146 )
- )
- ( /32307EA1 R3  R1 100K {Lib=R}
-  (    1 N-000146 )
-  (    2 N-000145 )
- )
- ( /32307DE2 CP6  C1 47uF {Lib=CP}
-  (    1 VCC )
-  (    2 GND )
- )
- ( /32307DCF CP6  C4 47uF {Lib=CP}
-  (    1 VCC )
-  (    2 GND )
- )
- ( /32307DCA CP6  C5 47uF {Lib=CP}
-  (    1 VCC )
-  (    2 GND )
- )
- ( /32307DC0 CP6  C6 47uF {Lib=CP}
-  (    1 VCC )
-  (    2 GND )
- )
- ( /322D35B4 20dip300  U2 74LS688 {Lib=74LS688}
-  (    1 /PC-AEN )
-  (    2 /PC-A5 )
-  (    3 /REF5 )
-  (    4 /PC-A8 )
-  (    5 /REF8 )
-  (    6 /PC-A9 )
-  (    7 /REF9 )
-  (    8 /PC-A11 )
-  (    9 /REF11 )
-  (   10 GND )
-  (   11 /PC-A10 )
-  (   12 /REF10 )
-  (   13 /PC-A7 )
-  (   14 /REF7 )
-  (   15 /PC-A6 )
-  (   16 /REF6 )
-  (   17 /PC-A4 )
-  (   18 /REF4 )
-  (   19 /MATCHL )
-  (   20 VCC )
- )
- ( /322D32FA PGA120  U9 4003APG120 {Lib=4003APG120}
-  (   A1 ? )
-  (   A2 ? )
-  (   A3 ? )
-  (   A4 /MA9 )
-  (   A5 /MD1 )
-  (   A6 /MD3 )
-  (   A7 /MD4 )
-  (   A8 /MD5 )
-  (   A9 /MD6 )
-  (  A10 /CS1- )
-  (  A11 /MA0 )
-  (  A12 /STROBE )
-  (  A13 /WR- )
-  (   B1 ? )
-  (   B2 /MA1 )
-  (   B3 /MA7 )
-  (   B4 ? )
-  (   B5 ? )
-  (   B6 /MD2 )
-  (   B7 GND )
-  (   B8 /MD7 )
-  (   B9 /OE- )
-  (  B10 ? )
-  (  B11 VCC )
-  (  B12 VCC )
-  (  B13 ? )
-  (   C1 /MA13 )
-  (   C2 /MA3 )
-  (   C3 VCC )
-  (   C4 GND )
-  (   C5 ? )
-  (   C6 /MD0 )
-  (   C8 /MA16 )
-  (   C9 /MA10 )
-  (  C10 GND )
-  (  C11 VCC )
-  (  C12 /AUTOFD- )
-  (  C13 /MA5 )
-  (   D1 /MA14 )
-  (   D2 /MA11 )
-  (   D3 /MA2 )
-  (  D11 VCC )
-  (  D12 /BIT0 )
-  (  D13 /ERROR- )
-  (   E1 /MA4 )
-  (   E2 ? )
-  (   E3 ? )
-  (  E11 ? )
-  (  E12 /INIT- )
-  (  E13 /BIT1 )
-  (   F1 /MA15 )
-  (   F2 /MA6 )
-  (   F3 /MA12 )
-  (  F11 /SLCTIN- )
-  (  F12 /BIT2 )
-  (  F13 /LED2 )
-  (   G1 /MA8 )
-  (   G2 GND )
-  (  G11 GND )
-  (  G12 VCC )
-  (  G13 /BIT3 )
-  (   H1 /PC-A8 )
-  (   H2 /PC-A7 )
-  (   H3 /PC-A4 )
-  (  H11 /BIT7 )
-  (  H12 /BIT5 )
-  (  H13 /BIT4 )
-  (   J1 /PC-A6 )
-  (   J2 /PC-A5 )
-  (   J3 ? )
-  (  J11 ? )
-  (  J12 /BUST+ )
-  (  J13 /BIT6 )
-  (   K1 /8MH-OUT )
-  (   K2 /PC-A3 )
-  (   K3 GND )
-  (  K11 GND )
-  (  K12 ? )
-  (  K13 /ACK )
-  (   L1 N-000145 )
-  (   L2 /SEL_LPT )
-  (   L3 VCC )
-  (   L4 /CLKLCA )
-  (   L5 ? )
-  (   L6 ? )
-  (   L7 GND )
-  (   L8 /PC-A10 )
-  (   L9 ? )
-  (  L10 VCC )
-  (  L11 /DONE )
-  (  L12 /D7 )
-  (  L13 /PE+ )
-  (   M1 ? )
-  (   M2 ? )
-  (   M3 /LED1 )
-  (   M4 /CLKLCA )
-  (   M5 /PC-A2 )
-  (   M6 /PC-A0 )
-  (   M7 VCC )
-  (   M8 /PC-RD )
-  (   M9 /D3 )
-  (  M10 /D4 )
-  (  M11 /D6 )
-  (  M12 /PROG- )
-  (   N1 ? )
-  (   N2 /D0 )
-  (   N3 ? )
-  (   N4 /PC-A1 )
-  (   N5 ? )
-  (   N6 /PC-WR )
-  (   N7 /PC-A9 )
-  (   N8 /D1 )
-  (   N9 /D2 )
-  (  N10 /PC-AEN )
-  (  N11 /D5 )
-  (  N12 ? )
-  (  N13 /SLCT+ )
- )
- ( /322D32BE LEDV  D2 LED {Lib=LED}
-  (    1 N-000104 )
-  (    2 GND )
- )
- ( /322D32AC LEDV  D1 LED {Lib=LED}
-  (    1 N-000105 )
-  (    2 GND )
- )
- ( /322D32A0 R3  R5 330 {Lib=R}
-  (    1 N-000104 )
-  (    2 /LED2 )
- )
- ( /322D3295 R3  R4 330 {Lib=R}
-  (    1 N-000105 )
-  (    2 /LED1 )
- )
- ( /322D321C 24dip300  U8 EP600 {Lib=EP600}
-  (    1 GND )
-  (    2 /MATCHL )
-  (    3 N-000106 )
-  (    4 N-000107 )
-  (    5 N-000108 )
-  (    6 N-000109 )
-  (    7 /PC-WR )
-  (    8 ? )
-  (    9 ? )
-  (   10 ? )
-  (   11 /RSTL )
-  (   12 GND )
-  (   13 /WR_REG )
-  (   14 /PC-RD )
-  (   15 /WR_REG )
-  (   16 /CLKLCA )
-  (   17 /DIR )
-  (   18 /SEL_LPT )
-  (   19 /PROG- )
-  (   20 /DONE )
-  (   21 /D0 )
-  (   22 /ENBBUF )
-  (   23 VCC )
-  (   24 VCC )
- )
- ( /322D31F4 20dip300  U1 74LS245 {Lib=74LS245}
-  (    1 /DIR )
-  (    2 /PC-DB0 )
-  (    3 /PC-DB1 )
-  (    4 /PC-DB2 )
-  (    5 /PC-DB3 )
-  (    6 /PC-DB4 )
-  (    7 /PC-DB5 )
-  (    8 /PC-DB6 )
-  (    9 /PC-DB7 )
-  (   10 GND )
-  (   11 /D7 )
-  (   12 /D6 )
-  (   13 /D5 )
-  (   14 /D4 )
-  (   15 /D3 )
-  (   16 /D2 )
-  (   17 /D1 )
-  (   18 /D0 )
-  (   19 /ENBBUF )
-  (   20 VCC )
- )
- ( /322D3011 BUS_PC  BUS1 BUSPC {Lib=BUSPC}
-  (    1 GND )
-  (    2 /PC-RST )
-  (    3 VCC )
-  (    4 ? )
-  (    5 ? )
-  (    6 ? )
-  (    7 ? )
-  (    8 ? )
-  (    9 ? )
-  (   10 ? )
-  (   11 ? )
-  (   12 ? )
-  (   13 /PC-IOW )
-  (   14 /PC-IOR )
-  (   15 ? )
-  (   16 ? )
-  (   17 ? )
-  (   18 ? )
-  (   19 ? )
-  (   20 ? )
-  (   21 ? )
-  (   22 ? )
-  (   23 ? )
-  (   24 ? )
-  (   25 ? )
-  (   26 ? )
-  (   27 ? )
-  (   28 ? )
-  (   29 VCC )
-  (   30 ? )
-  (   31 GND )
-  (   32 ? )
-  (   33 /PC-DB7 )
-  (   34 /PC-DB6 )
-  (   35 /PC-DB5 )
-  (   36 /PC-DB4 )
-  (   37 /PC-DB3 )
-  (   38 /PC-DB2 )
-  (   39 /PC-DB1 )
-  (   40 /PC-DB0 )
-  (   41 ? )
-  (   42 /PC-AEN )
-  (   43 ? )
-  (   44 ? )
-  (   45 ? )
-  (   46 ? )
-  (   47 ? )
-  (   48 ? )
-  (   49 ? )
-  (   50 ? )
-  (   51 /PC-A11 )
-  (   52 /PC-A10 )
-  (   53 /PC-A9 )
-  (   54 /PC-A8 )
-  (   55 /PC-A7 )
-  (   56 /PC-A6 )
-  (   57 /PC-A5 )
-  (   58 /PC-A4 )
-  (   59 /PC-A3 )
-  (   60 /PC-A2 )
-  (   61 /PC-A1 )
-  (   62 /PC-A0 )
- )
-)
-*
-{ Allowed footprints by component:
-$component P1
- DB25*
-$endlist
-$component R3
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component C3
- SM*
- C?
- C1-1
-$endlist
-$component C2
- SM*
- C?
- C1-1
-$endlist
-$component R2
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component R1
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component C1
- CP*
- SM*
-$endlist
-$component C4
- CP*
- SM*
-$endlist
-$component C5
- CP*
- SM*
-$endlist
-$component C6
- CP*
- SM*
-$endlist
-$component D2
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$endlist
-$component D1
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$endlist
-$component R5
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component R4
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$endfootprintlist
-}
-{ Pin List by Nets
-Net 15 "/PC-RST" "PC-RST"
- U3 9
- U3 8
- BUS1 2
-Net 16 "/PC-IOR" "PC-IOR"
- BUS1 14
- U3 7
-Net 17 "/PC-IOW" "PC-IOW"
- BUS1 13
- U3 6
-Net 18 "/PC-A2" "PC-A2"
- BUS1 60
- U9 M5
- U3 4
-Net 19 "/PC-A1" "PC-A1"
- BUS1 61
- U3 2
- U9 N4
-Net 20 "/PC-A0" "PC-A0"
- U9 M6
- U3 3
- BUS1 62
-Net 21 "GND" "GND"
- JP1 15
- U8 1
- JP1 13
- JP1 11
- P1 25
- P1 24
- D1 2
- P1 23
- P1 22
- D2 2
- U1 10
- U8 12
- P1 21
- P1 20
- U5 16
- U9 K3
- U9 C4
- U9 G2
- U9 G11
- U9 K11
- U9 C10
- U9 B7
- U9 L7
- BUS1 1
- BUS1 31
- JP1 9
- JP1 7
- JP1 5
- JP1 3
- JP1 1
- C1 2
- C4 2
- C5 2
- C6 2
- U2 10
- C3 2
- P1 18
- C2 2
- U3 10
- P1 19
- U3 19
- U3 1
-Net 22 "VCC" "VCC"
- U2 20
- BUS1 29
- U5 32
- U9 B12
- U9 L10
- U9 G12
- U8 23
- U8 24
- U1 20
- U9 M7
- R3 2
- U9 D11
- C4 1
- U9 C11
- C1 1
- RR1 1
- U9 B11
- U9 C3
- U3 20
- U9 L3
- BUS1 3
- C6 1
- C5 1
-Net 23 "/PC-AEN" "PC-AEN"
- U9 N10
- BUS1 42
- U2 1
-Net 53 "/MA8" "MA8"
- U9 G1
- U5 27
-Net 54 "/MD4" "MD4"
- U9 A7
- U5 18
-Net 55 "/MA13" "MA13"
- U5 28
- U9 C1
-Net 56 "/MD5" "MD5"
- U5 19
- U9 A8
-Net 57 "/WR-" "WR-"
- U5 29
- U9 A13
-Net 61 "/RSTL" "RSTL"
- U8 11
- U3 12
-Net 63 "/MA16" "MA16"
- U5 2
- U9 C8
-Net 64 "/MA14" "MA14"
- U9 D1
- U5 3
-Net 65 "/MA12" "MA12"
- U5 4
- U9 F3
-Net 66 "/MA7" "MA7"
- U9 B3
- U5 5
-Net 67 "/MA6" "MA6"
- U9 F2
- U5 6
-Net 68 "/MA5" "MA5"
- U9 C13
- U5 7
-Net 69 "/MA4" "MA4"
- U5 8
- U9 E1
-Net 70 "/MD6" "MD6"
- U5 20
- U9 A9
-Net 71 "" ""
- R3 1
- U5 30
-Net 72 "/MD7" "MD7"
- U5 21
- U9 B8
-Net 73 "/MA15" "MA15"
- U9 F1
- U5 31
-Net 74 "/MA0" "MA0"
- U9 A11
- U5 12
-Net 75 "/CS1-" "CS1-"
- U9 A10
- U5 22
-Net 76 "/MD0" "MD0"
- U9 C6
- U5 13
-Net 77 "/MA10" "MA10"
- U9 C9
- U5 23
-Net 78 "/MD1" "MD1"
- U5 14
- U9 A5
-Net 79 "/OE-" "OE-"
- U9 B9
- U5 24
-Net 80 "/MD2" "MD2"
- U9 B6
- U5 15
-Net 81 "/MA11" "MA11"
- U5 25
- U9 D2
-Net 82 "/MA9" "MA9"
- U9 A4
- U5 26
-Net 83 "/MD3" "MD3"
- U9 A6
- U5 17
-Net 84 "/PC-RD" "PC-RD"
- U3 13
- U8 14
- U9 M8
-Net 85 "/SEL_LPT" "SEL_LPT"
- U9 L2
- U8 18
-Net 86 "/DIR" "DIR"
- U8 17
- U1 1
-Net 87 "/PC-DB0" "PC-DB0"
- BUS1 40
- U1 2
-Net 88 "/PC-DB1" "PC-DB1"
- BUS1 39
- U1 3
-Net 89 "/PC-DB2" "PC-DB2"
- U1 4
- BUS1 38
-Net 90 "/PC-DB3" "PC-DB3"
- U1 5
- BUS1 37
-Net 91 "/PC-DB4" "PC-DB4"
- U1 6
- BUS1 36
-Net 92 "/PC-DB5" "PC-DB5"
- U1 7
- BUS1 35
-Net 93 "/PC-DB6" "PC-DB6"
- U1 8
- BUS1 34
-Net 94 "/PC-DB7" "PC-DB7"
- BUS1 33
- U1 9
-Net 95 "/D7" "D7"
- U9 L12
- U1 11
-Net 96 "/D6" "D6"
- U9 M11
- U1 12
-Net 97 "/D5" "D5"
- U1 13
- U9 N11
-Net 98 "/D4" "D4"
- U9 M10
- U1 14
-Net 99 "/D3" "D3"
- U1 15
- U9 M9
-Net 100 "/D2" "D2"
- U1 16
- U9 N9
-Net 101 "/D1" "D1"
- U9 N8
- U1 17
-Net 103 "/LED2" "LED2"
- R5 2
- U9 F13
-Net 104 "" ""
- D2 1
- R5 1
-Net 105 "" ""
- R4 1
- D1 1
-Net 106 "" ""
- U3 18
- U8 3
-Net 107 "" ""
- U8 4
- U3 17
-Net 108 "" ""
- U3 16
- U8 5
-Net 109 "" ""
- U3 15
- U8 6
-Net 110 "/PC-WR" "PC-WR"
- U8 7
- U9 N6
- U3 14
-Net 111 "/PC-A9" "PC-A9"
- U2 6
- U9 N7
- BUS1 53
-Net 112 "/PC-A8" "PC-A8"
- U9 H1
- U2 4
- BUS1 54
-Net 113 "/PC-A7" "PC-A7"
- U9 H2
- U2 13
- BUS1 55
-Net 114 "/PC-A6" "PC-A6"
- BUS1 56
- U2 15
- U9 J1
-Net 115 "/PC-A5" "PC-A5"
- U2 2
- BUS1 57
- U9 J2
-Net 116 "/PC-A4" "PC-A4"
- BUS1 58
- U2 17
- U9 H3
-Net 117 "/PC-A3" "PC-A3"
- U3 5
- BUS1 59
- U9 K2
-Net 118 "/D0" "D0"
- U8 21
- U9 N2
- U1 18
-Net 119 "/ENBBUF" "ENBBUF"
- U1 19
- U8 22
-Net 120 "/PC-A11" "PC-A11"
- U2 8
- BUS1 51
-Net 121 "/PC-A10" "PC-A10"
- BUS1 52
- U2 11
- U9 L8
-Net 123 "/MA2" "MA2"
- U9 D3
- U5 10
-Net 125 "/LED1" "LED1"
- U9 M3
- R4 2
-Net 127 "/CLKLCA" "CLKLCA"
- U9 L4
- U9 M4
- U8 16
-Net 130 "/MATCHL" "MATCHL"
- U2 19
- U8 2
-Net 133 "/MA1" "MA1"
- U5 11
- U9 B2
-Net 134 "/MA3" "MA3"
- U5 9
- U9 C2
-Net 137 "/DONE" "DONE"
- U9 L11
- U8 20
-Net 139 "/PROG-" "PROG-"
- U9 M12
- U8 19
-Net 144 "/WR_REG" "WR_REG"
- U8 15
- U8 13
-Net 145 "" ""
- X1 1
- C2 1
- R1 2
- U9 L1
-Net 146 "" ""
- C3 1
- R1 1
- X1 2
- R2 2
-Net 147 "/BIT6" "BIT6"
- U9 J13
- P1 8
-Net 148 "/BIT7" "BIT7"
- U9 H11
- P1 9
-Net 149 "/ACK" "ACK"
- U9 K13
- P1 10
-Net 150 "/BUST+" "BUST+"
- U9 J12
- P1 11
-Net 151 "/PE+" "PE+"
- U9 L13
- P1 12
-Net 152 "/SLCT+" "SLCT+"
- P1 13
- U9 N13
-Net 153 "/8MH-OUT" "8MH-OUT"
- R2 1
- U9 K1
-Net 155 "/STROBE" "STROBE"
- U9 A12
- P1 1
-Net 156 "/AUTOFD-" "AUTOFD-"
- P1 14
- U9 C12
-Net 157 "/ERROR-" "ERROR-"
- U9 D13
- P1 15
-Net 158 "/BIT2" "BIT2"
- U9 F12
- P1 4
-Net 159 "/INIT-" "INIT-"
- U9 E12
- P1 16
-Net 160 "/SLCTIN-" "SLCTIN-"
- U9 F11
- P1 17
-Net 161 "/BIT0" "BIT0"
- P1 2
- U9 D12
-Net 162 "/BIT1" "BIT1"
- U9 E13
- P1 3
-Net 163 "/BIT3" "BIT3"
- U9 G13
- P1 5
-Net 164 "/BIT4" "BIT4"
- U9 H13
- P1 6
-Net 165 "/BIT5" "BIT5"
- P1 7
- U9 H12
-Net 166 "/REF10" "REF10"
- RR1 9
- U2 12
- JP1 2
-Net 167 "/REF11" "REF11"
- JP1 4
- RR1 8
- U2 9
-Net 168 "/REF7" "REF7"
- RR1 7
- JP1 6
- U2 14
-Net 169 "/REF9" "REF9"
- RR1 6
- JP1 8
- U2 7
-Net 170 "/REF6" "REF6"
- RR1 5
- JP1 10
- U2 16
-Net 171 "/REF8" "REF8"
- RR1 4
- JP1 12
- U2 5
-Net 172 "/REF4" "REF4"
- U2 18
- JP1 14
- RR1 3
-Net 173 "/REF5" "REF5"
- RR1 2
- U2 3
- JP1 16
-}
-#End
+# EESchema Netlist Version 1.1 created  13/01/2011 13:12:57
+(
+ ( /322D3011 BUS_PC BUS1 BUSPC
+  ( 1 GND )
+  ( 2 /PC-RST )
+  ( 3 VCC )
+  ( 4 ? )
+  ( 5 ? )
+  ( 6 ? )
+  ( 7 ? )
+  ( 8 ? )
+  ( 9 ? )
+  ( 10 ? )
+  ( 11 ? )
+  ( 12 ? )
+  ( 13 /PC-IOW )
+  ( 14 /PC-IOR )
+  ( 15 ? )
+  ( 16 ? )
+  ( 17 ? )
+  ( 18 ? )
+  ( 19 ? )
+  ( 20 ? )
+  ( 21 ? )
+  ( 22 ? )
+  ( 23 ? )
+  ( 24 ? )
+  ( 25 ? )
+  ( 26 ? )
+  ( 27 ? )
+  ( 28 ? )
+  ( 29 VCC )
+  ( 30 ? )
+  ( 31 GND )
+  ( 32 ? )
+  ( 33 /PC-DB7 )
+  ( 34 /PC-DB6 )
+  ( 35 /PC-DB5 )
+  ( 36 /PC-DB4 )
+  ( 37 /PC-DB3 )
+  ( 38 /PC-DB2 )
+  ( 39 /PC-DB1 )
+  ( 40 /PC-DB0 )
+  ( 41 ? )
+  ( 42 /PC-AEN )
+  ( 43 ? )
+  ( 44 ? )
+  ( 45 ? )
+  ( 46 ? )
+  ( 47 ? )
+  ( 48 ? )
+  ( 49 ? )
+  ( 50 ? )
+  ( 51 /PC-A11 )
+  ( 52 /PC-A10 )
+  ( 53 /PC-A9 )
+  ( 54 /PC-A8 )
+  ( 55 /PC-A7 )
+  ( 56 /PC-A6 )
+  ( 57 /PC-A5 )
+  ( 58 /PC-A4 )
+  ( 59 /PC-A3 )
+  ( 60 /PC-A2 )
+  ( 61 /PC-A1 )
+  ( 62 /PC-A0 )
+ )
+ ( /32307DE2 CP6 C1 47uF
+  ( 1 VCC )
+  ( 2 GND )
+ )
+ ( /32307ECF C1 C2 47pF
+  ( 1 N-000145 )
+  ( 2 GND )
+ )
+ ( /32307ED4 C1 C3 47pF
+  ( 1 N-000146 )
+  ( 2 GND )
+ )
+ ( /32307DCF CP6 C4 47uF
+  ( 1 VCC )
+  ( 2 GND )
+ )
+ ( /32307DCA CP6 C5 47uF
+  ( 1 VCC )
+  ( 2 GND )
+ )
+ ( /32307DC0 CP6 C6 47uF
+  ( 1 VCC )
+  ( 2 GND )
+ )
+ ( /322D32AC LEDV D1 LED
+  ( 1 N-000105 )
+  ( 2 GND )
+ )
+ ( /322D32BE LEDV D2 LED
+  ( 1 N-000104 )
+  ( 2 GND )
+ )
+ ( /32568D1E pin_array_8x2 JP1 CONN_8X2
+  ( 1 GND )
+  ( 2 /REF10 )
+  ( 3 GND )
+  ( 4 /REF11 )
+  ( 5 GND )
+  ( 6 /REF7 )
+  ( 7 GND )
+  ( 8 /REF9 )
+  ( 9 GND )
+  ( 10 /REF6 )
+  ( 11 GND )
+  ( 12 /REF8 )
+  ( 13 GND )
+  ( 14 /REF4 )
+  ( 15 GND )
+  ( 16 /REF5 )
+ )
+ ( /3256759C DB25FC P1 DB25FEMELLE
+  ( 1 /STROBE )
+  ( 2 /BIT0 )
+  ( 3 /BIT1 )
+  ( 4 /BIT2 )
+  ( 5 /BIT3 )
+  ( 6 /BIT4 )
+  ( 7 /BIT5 )
+  ( 8 /BIT6 )
+  ( 9 /BIT7 )
+  ( 10 /ACK )
+  ( 11 /BUST+ )
+  ( 12 /PE+ )
+  ( 13 /SLCT+ )
+  ( 14 /AUTOFD- )
+  ( 15 /ERROR- )
+  ( 16 /INIT- )
+  ( 17 /SLCTIN- )
+  ( 18 GND )
+  ( 19 GND )
+  ( 20 GND )
+  ( 21 GND )
+  ( 22 GND )
+  ( 23 GND )
+  ( 24 GND )
+  ( 25 GND )
+ )
+ ( /32307EA1 R3 R1 100K
+  ( 1 N-000146 )
+  ( 2 N-000145 )
+ )
+ ( /32307EAA R3 R2 1K
+  ( 1 /8MH-OUT )
+  ( 2 N-000146 )
+ )
+ ( /324002E6 R3 R3 10K
+  ( 1 N-000071 )
+  ( 2 VCC )
+ )
+ ( /322D3295 R3 R4 330
+  ( 1 N-000105 )
+  ( 2 /LED1 )
+ )
+ ( /322D32A0 R3 R5 330
+  ( 1 N-000104 )
+  ( 2 /LED2 )
+ )
+ ( /325679C1 r_pack9 RR1 9x1K
+  ( 1 VCC )
+  ( 2 /REF5 )
+  ( 3 /REF4 )
+  ( 4 /REF8 )
+  ( 5 /REF6 )
+  ( 6 /REF9 )
+  ( 7 /REF7 )
+  ( 8 /REF11 )
+  ( 9 /REF10 )
+  ( 10 ? )
+ )
+ ( /322D31F4 20dip300 U1 74LS245
+  ( 1 /DIR )
+  ( 2 /PC-DB0 )
+  ( 3 /PC-DB1 )
+  ( 4 /PC-DB2 )
+  ( 5 /PC-DB3 )
+  ( 6 /PC-DB4 )
+  ( 7 /PC-DB5 )
+  ( 8 /PC-DB6 )
+  ( 9 /PC-DB7 )
+  ( 10 GND )
+  ( 11 /D7 )
+  ( 12 /D6 )
+  ( 13 /D5 )
+  ( 14 /D4 )
+  ( 15 /D3 )
+  ( 16 /D2 )
+  ( 17 /D1 )
+  ( 18 /D0 )
+  ( 19 /ENBBUF )
+  ( 20 VCC )
+ )
+ ( /322D35B4 20dip300 U2 74LS688
+  ( 1 /PC-AEN )
+  ( 2 /PC-A5 )
+  ( 3 /REF5 )
+  ( 4 /PC-A8 )
+  ( 5 /REF8 )
+  ( 6 /PC-A9 )
+  ( 7 /REF9 )
+  ( 8 /PC-A11 )
+  ( 9 /REF11 )
+  ( 10 GND )
+  ( 11 /PC-A10 )
+  ( 12 /REF10 )
+  ( 13 /PC-A7 )
+  ( 14 /REF7 )
+  ( 15 /PC-A6 )
+  ( 16 /REF6 )
+  ( 17 /PC-A4 )
+  ( 18 /REF4 )
+  ( 19 /MATCHL )
+  ( 20 VCC )
+ )
+ ( /4A087146 20dip300 U3 74LS541
+  ( 1 GND )
+  ( 2 /PC-A1 )
+  ( 3 /PC-A0 )
+  ( 4 /PC-A2 )
+  ( 5 /PC-A3 )
+  ( 6 /PC-IOW )
+  ( 7 /PC-IOR )
+  ( 8 /PC-RST )
+  ( 9 /PC-RST )
+  ( 10 GND )
+  ( 11 ? )
+  ( 12 /RSTL )
+  ( 13 /PC-RD )
+  ( 14 /PC-WR )
+  ( 15 N-000109 )
+  ( 16 N-000108 )
+  ( 17 N-000107 )
+  ( 18 N-000106 )
+  ( 19 GND )
+  ( 20 VCC )
+ )
+ ( /3240023F 32dip600 U5 628128
+  ( 2 /MA16 )
+  ( 3 /MA14 )
+  ( 4 /MA12 )
+  ( 5 /MA7 )
+  ( 6 /MA6 )
+  ( 7 /MA5 )
+  ( 8 /MA4 )
+  ( 9 /MA3 )
+  ( 10 /MA2 )
+  ( 11 /MA1 )
+  ( 12 /MA0 )
+  ( 13 /MD0 )
+  ( 14 /MD1 )
+  ( 15 /MD2 )
+  ( 16 GND )
+  ( 17 /MD3 )
+  ( 18 /MD4 )
+  ( 19 /MD5 )
+  ( 20 /MD6 )
+  ( 21 /MD7 )
+  ( 22 /CS1- )
+  ( 23 /MA10 )
+  ( 24 /OE- )
+  ( 25 /MA11 )
+  ( 26 /MA9 )
+  ( 27 /MA8 )
+  ( 28 /MA13 )
+  ( 29 /WR- )
+  ( 30 N-000071 )
+  ( 31 /MA15 )
+  ( 32 VCC )
+ )
+ ( /322D321C 24dip300 U8 EP600
+  ( 1 GND )
+  ( 2 /MATCHL )
+  ( 3 N-000106 )
+  ( 4 N-000107 )
+  ( 5 N-000108 )
+  ( 6 N-000109 )
+  ( 7 /PC-WR )
+  ( 8 ? )
+  ( 9 ? )
+  ( 10 ? )
+  ( 11 /RSTL )
+  ( 12 GND )
+  ( 13 /WR_REG )
+  ( 14 /PC-RD )
+  ( 15 /WR_REG )
+  ( 16 /CLKLCA )
+  ( 17 /DIR )
+  ( 18 /SEL_LPT )
+  ( 19 /PROG- )
+  ( 20 /DONE )
+  ( 21 /D0 )
+  ( 22 /ENBBUF )
+  ( 23 VCC )
+  ( 24 VCC )
+ )
+ ( /322D32FA PGA120 U9 4003APG120
+  ( A1 ? )
+  ( A2 ? )
+  ( A3 ? )
+  ( A4 /MA9 )
+  ( A5 /MD1 )
+  ( A6 /MD3 )
+  ( A7 /MD4 )
+  ( A8 /MD5 )
+  ( A9 /MD6 )
+  ( A10 /CS1- )
+  ( A11 /MA0 )
+  ( A12 /STROBE )
+  ( A13 /WR- )
+  ( B1 ? )
+  ( B2 /MA1 )
+  ( B3 /MA7 )
+  ( B4 ? )
+  ( B5 ? )
+  ( B6 /MD2 )
+  ( B7 GND )
+  ( B8 /MD7 )
+  ( B9 /OE- )
+  ( B10 ? )
+  ( B11 VCC )
+  ( B12 VCC )
+  ( B13 ? )
+  ( C1 /MA13 )
+  ( C2 /MA3 )
+  ( C3 VCC )
+  ( C4 GND )
+  ( C5 ? )
+  ( C6 /MD0 )
+  ( C8 /MA16 )
+  ( C9 /MA10 )
+  ( C10 GND )
+  ( C11 VCC )
+  ( C12 /AUTOFD- )
+  ( C13 /MA5 )
+  ( D1 /MA14 )
+  ( D2 /MA11 )
+  ( D3 /MA2 )
+  ( D11 VCC )
+  ( D12 /BIT0 )
+  ( D13 /ERROR- )
+  ( E1 /MA4 )
+  ( E2 ? )
+  ( E3 ? )
+  ( E11 ? )
+  ( E12 /INIT- )
+  ( E13 /BIT1 )
+  ( F1 /MA15 )
+  ( F2 /MA6 )
+  ( F3 /MA12 )
+  ( F11 /SLCTIN- )
+  ( F12 /BIT2 )
+  ( F13 /LED2 )
+  ( G1 /MA8 )
+  ( G2 GND )
+  ( G11 GND )
+  ( G12 VCC )
+  ( G13 /BIT3 )
+  ( H1 /PC-A8 )
+  ( H2 /PC-A7 )
+  ( H3 /PC-A4 )
+  ( H11 /BIT7 )
+  ( H12 /BIT5 )
+  ( H13 /BIT4 )
+  ( J1 /PC-A6 )
+  ( J2 /PC-A5 )
+  ( J3 ? )
+  ( J11 ? )
+  ( J12 /BUST+ )
+  ( J13 /BIT6 )
+  ( K1 /8MH-OUT )
+  ( K2 /PC-A3 )
+  ( K3 GND )
+  ( K11 GND )
+  ( K12 ? )
+  ( K13 /ACK )
+  ( L1 N-000145 )
+  ( L2 /SEL_LPT )
+  ( L3 VCC )
+  ( L4 /CLKLCA )
+  ( L5 ? )
+  ( L6 ? )
+  ( L7 GND )
+  ( L8 /PC-A10 )
+  ( L9 ? )
+  ( L10 VCC )
+  ( L11 /DONE )
+  ( L12 /D7 )
+  ( L13 /PE+ )
+  ( M1 ? )
+  ( M2 ? )
+  ( M3 /LED1 )
+  ( M4 /CLKLCA )
+  ( M5 /PC-A2 )
+  ( M6 /PC-A0 )
+  ( M7 VCC )
+  ( M8 /PC-RD )
+  ( M9 /D3 )
+  ( M10 /D4 )
+  ( M11 /D6 )
+  ( M12 /PROG- )
+  ( N1 ? )
+  ( N2 /D0 )
+  ( N3 ? )
+  ( N4 /PC-A1 )
+  ( N5 ? )
+  ( N6 /PC-WR )
+  ( N7 /PC-A9 )
+  ( N8 /D1 )
+  ( N9 /D2 )
+  ( N10 /PC-AEN )
+  ( N11 /D5 )
+  ( N12 ? )
+  ( N13 /SLCT+ )
+ )
+ ( /32307EC0 HC-18UH X1 8MHz
+  ( 1 N-000145 )
+  ( 2 N-000146 )
+ )
+)
+*
+{ Allowed footprints by component:
+$component C1
+ CP*
+ SM*
+$endlist
+$component C2
+ SM*
+ C?
+ C1-1
+$endlist
+$component C3
+ SM*
+ C?
+ C1-1
+$endlist
+$component C4
+ CP*
+ SM*
+$endlist
+$component C5
+ CP*
+ SM*
+$endlist
+$component C6
+ CP*
+ SM*
+$endlist
+$component D1
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$endlist
+$component D2
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$endlist
+$component P1
+ DB25*
+$endlist
+$component R1
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R2
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R3
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R4
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R5
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$endfootprintlist
+}
diff --git a/demos/interf_u/interf_u.pro b/demos/interf_u/interf_u.pro
index b93c81dc00..f6b9f6d960 100644
--- a/demos/interf_u/interf_u.pro
+++ b/demos/interf_u/interf_u.pro
@@ -1,85 +1,84 @@
-update=ven. 03 déc. 2010 20:28:58 CET
-version=1
-last_client=pcbnew
-[common]
-NetDir=
-[general]
-version=1
-RootSch=interf_u.sch
-BoardNm=interf_u.brd
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
-[eeschema]
-version=1
-LibDir=F:\\kicad\\share\\library
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
-RptD_X=0
-RptD_Y=100
-RptLab=1
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=conn
-LibName4=linear
-LibName5=regul
-LibName6=74xx
-LibName7=cmos4000
-LibName8=adc-dac
-LibName9=memory
-LibName10=xilinx
-LibName11=special
-[pcbnew]
-version=1
-PadDrlX=0
-PadDimH=1500
-PadDimV=2500
-BoardThickness=630
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=50
-TxtLar=170
-MSegLar=400
-LastNetListRead=interf_u.net
-[pcbnew/libraries]
-LibDir=F:\\kicad\\share\\modules\\packages3d
-LibName1=connect
-LibName2=image
-LibName3=discret
-LibName4=pin_array
-LibName5=sockets
-LibName6=divers
-LibName7=libcms
-LibName8=display
+update=22/01/2011 11:10:15
+version=1
+last_client=pcbnew
+[common]
+NetDir=
+[general]
+version=1
+RootSch=interf_u.sch
+BoardNm=interf_u.brd
+[eeschema]
+version=1
+LibDir=F:\\kicad\\share\\library
+NetFmt=1
+HPGLSpd=20
+HPGLDm=15
+HPGLNum=1
+offX_A4=0
+offY_A4=0
+offX_A3=0
+offY_A3=0
+offX_A2=0
+offY_A2=0
+offX_A1=0
+offY_A1=0
+offX_A0=0
+offY_A0=0
+offX_A=0
+offY_A=0
+offX_B=0
+offY_B=0
+offX_C=0
+offY_C=0
+offX_D=0
+offY_D=0
+offX_E=0
+offY_E=0
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=conn
+LibName4=linear
+LibName5=regul
+LibName6=74xx
+LibName7=cmos4000
+LibName8=adc-dac
+LibName9=memory
+LibName10=xilinx
+LibName11=special
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
+[pcbnew]
+version=1
+PadDrlX=354
+PadDimH=550
+PadDimV=550
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+VEgarde=100
+DrawLar=150
+EdgeLar=50
+TxtLar=170
+MSegLar=400
+LastNetListRead=interf_u.net
+[pcbnew/libraries]
+LibDir=F:\\kicad\\share\\modules\\packages3d
+LibName1=connect
+LibName2=discret
+LibName3=dip_sockets
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
diff --git a/demos/interf_u/interf_u.sch b/demos/interf_u/interf_u.sch
index 0293add2eb..32c1c51b1d 100644
--- a/demos/interf_u/interf_u.sch
+++ b/demos/interf_u/interf_u.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date 19/08/2010 20:44:23
+EESchema Schematic File Version 2  date 07/12/2010 12:09:23
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -10,14 +10,13 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
-LIBS:image
 LIBS:interf_u-cache
-EELAYER 24  0
+EELAYER 25  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 1 1
 Title "INTERFACE UNIVERSEL"
-Date "19 aug 2010"
+Date "7 dec 2010"
 Rev "2B"
 Comp "KICAD"
 Comment1 "Comment 1"
diff --git a/eeschema/block_libedit.cpp b/eeschema/block_libedit.cpp
index 43fc58f77b..802718ba25 100644
--- a/eeschema/block_libedit.cpp
+++ b/eeschema/block_libedit.cpp
@@ -130,7 +130,10 @@ bool LIB_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
         if( ItemCount )
             SaveCopyInUndoList( m_component );
         if ( m_component )
+        {
             m_component->DeleteSelectedItems();
+            OnModify();
+        }
         break;
 
     case BLOCK_SAVE:     /* Save */
@@ -151,7 +154,10 @@ bool LIB_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
         pt = GetScreen()->m_BlockLocate.Centre();
         pt.y *= -1;
         if ( m_component )
+        {
+            OnModify();
             m_component->MirrorSelectedItemsH( pt );
+        }
         break;
 
     case BLOCK_ZOOM:     /* Window Zoom */
diff --git a/include/hotkey_grid_table.h b/include/hotkey_grid_table.h
index 9c6e9eacc3..e50ad43ad6 100644
--- a/include/hotkey_grid_table.h
+++ b/include/hotkey_grid_table.h
@@ -25,6 +25,7 @@ public:
     virtual ~HotkeyGridTable();
     hotkey_spec_vector& getHotkeys();
 
+private:
     virtual int GetNumberRows();
     virtual int GetNumberCols();
     virtual bool IsEmptyCell( int row, int col );
@@ -43,6 +44,7 @@ public:
     virtual void SetValueAsCustom( int row, int col, void* value );
     virtual wxString GetColLabelValue( int col );
 
+public:
     virtual bool isHeader( int row );
     virtual void SetKeyCode( int row, long key );
     virtual void RestoreFrom( struct Ki_HotkeyInfoSectionDescriptor* origin );
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index a7435ba856..702a66767b 100644
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.01.21"
+!define PRODUCT_VERSION "2011.01.22"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
diff --git a/version.txt b/version.txt
index a5c2df09d1..30e478aba6 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2011 jan 21 (BZR 2753)
+2011 jan 22 (BZR 2754)
 files (.zip,.tgz):
-kicad-2011-01-21
+kicad-2011-01-22