From 3341669fc663df12f6606b4858cf3977e57428a6 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Mon, 16 Apr 2012 20:35:43 -0500 Subject: [PATCH] more footprint support for LEGACY_PLUGIN --- CMakeLists.txt | 2 - CMakeModules/config.h.cmake | 2 - common/CMakeLists.txt | 14 +- include/class_board_item.h | 30 -- include/wxBasePcbFrame.h | 44 +- pcbnew/CMakeLists.txt | 1 - pcbnew/class_board.h | 2 - pcbnew/class_board_connected_item.h | 6 - pcbnew/class_dimension.h | 4 - pcbnew/class_drawsegment.h | 4 - pcbnew/class_edge_mod.h | 4 - pcbnew/class_marker_pcb.h | 7 - pcbnew/class_mire.h | 4 - pcbnew/class_module.cpp | 1 + pcbnew/class_module.h | 31 +- pcbnew/class_netclass.h | 16 - pcbnew/class_netinfo.h | 12 - pcbnew/class_pad.cpp | 29 +- pcbnew/class_pad.h | 6 - pcbnew/class_pcb_text.h | 5 - pcbnew/class_text_mod.h | 10 - pcbnew/class_track.h | 2 - pcbnew/class_zone.h | 10 - .../dialog_edit_module_for_BoardEditor.cpp | 4 +- .../dialog_edit_module_for_Modedit.cpp | 5 +- pcbnew/files.cpp | 93 ---- pcbnew/gen_modules_placefile.cpp | 172 +++---- pcbnew/io_mgr.cpp | 18 +- pcbnew/io_mgr.h | 74 ++- pcbnew/{ioascii.cpp => ioascii.cpp.notused} | 0 pcbnew/{item_io.cpp => item_io.cpp.notused} | 0 pcbnew/legacy_plugin.cpp | 259 +++++++--- pcbnew/legacy_plugin.h | 20 +- pcbnew/librairi.cpp | 462 +++++++----------- pcbnew/loadcmp.cpp | 178 ++++--- 35 files changed, 698 insertions(+), 833 deletions(-) rename pcbnew/{ioascii.cpp => ioascii.cpp.notused} (100%) rename pcbnew/{item_io.cpp => item_io.cpp.notused} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20a86c8d9b..38a555006e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,6 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) option(USE_PCBNEW_SEXPR_FILE_FORMAT "Use s-expression Pcbnew file format support (default OFF)." ) -option(USE_NEW_PCBNEW_LOAD "use new plugin support for legacy file format" ON) -option(USE_NEW_PCBNEW_SAVE "use new plugin support for legacy file format" ON) option(USE_PCBNEW_NANOMETRES "Use nanometers for Pcbnew internal units instead of deci-mils (default OFF).") diff --git a/CMakeModules/config.h.cmake b/CMakeModules/config.h.cmake index 90e656c470..ff8454b84d 100644 --- a/CMakeModules/config.h.cmake +++ b/CMakeModules/config.h.cmake @@ -55,8 +55,6 @@ #cmakedefine USE_IMAGES_IN_MENUS 1 -#cmakedefine USE_NEW_PCBNEW_LOAD -#cmakedefine USE_NEW_PCBNEW_SAVE #cmakedefine USE_PCBNEW_NANOMETRES #cmakedefine USE_PCBNEW_SEXPR_FILE_FORMAT diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 7320e92788..7f8b5ded35 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -116,21 +116,13 @@ set(PCB_COMMON_SRCS ../pcbnew/collectors.cpp ../pcbnew/sel_layer.cpp ../pcbnew/pcb_plot_params.cpp + ../pcbnew/io_mgr.cpp + ../pcbnew/legacy_plugin.cpp + ../pcbnew/kicad_plugin.cpp pcb_plot_params_keywords.cpp dialogs/dialog_page_settings.cpp ) -if( USE_NEW_PCBNEW_LOAD OR USE_NEW_PCBNEW_SAVE ) - set( PCB_COMMON_SRCS - ${PCB_COMMON_SRCS} - ../pcbnew/item_io.cpp - ../pcbnew/io_mgr.cpp - ../pcbnew/legacy_plugin.cpp - ../pcbnew/kicad_plugin.cpp - ) -else() - set( PCB_COMMON_SRCS ${PCB_COMMON_SRCS} ../pcbnew/item_io.cpp ) -endif() # add -DPCBNEW to compilation of these PCBNEW sources set_source_files_properties( ${PCB_COMMON_SRCS} PROPERTIES diff --git a/include/class_board_item.h b/include/class_board_item.h index bd7e5a6743..511760c2b3 100644 --- a/include/class_board_item.h +++ b/include/class_board_item.h @@ -98,26 +98,6 @@ public: BOARD_ITEM* Back() const { return (BOARD_ITEM*) Pback; } BOARD_ITEM* GetParent() const { return (BOARD_ITEM*) m_Parent; } -#if 0 - // DICK: there is no value in having a polymorphic {Get,Set}Position(). We never - // call GetPosition() using a generic pointer, and the virtual is slower and - // can never be inlined. - - /** - * Function GetPosition - * returns the position of this object. - * @return const wxPoint - The position of this object - */ - virtual const wxPoint GetPosition() const = 0; - - /** - * Function SetPosition - * sets the position of this object. - * @param aPos is the new position of this object - */ - virtual void SetPosition( const wxPoint& aPos ) = 0; -#endif - /** * Function GetLayer * returns the layer this item is on. @@ -173,7 +153,6 @@ public: return false; // only MODULEs can be locked at this time. } - /** * Function UnLink * detaches this object from its owner. This base class implementation @@ -191,21 +170,12 @@ public: delete this; } - /** * Function ShowShape * converts the enum STROKE_T integer value to a wxString. */ static wxString ShowShape( STROKE_T aShape ); - /** - * Function Save - * writes the data structures for this object out to a FILE in "*.brd" format. - * @param aFile The FILE to write to. - * @return bool - true if success writing else false. - */ - virtual bool Save( FILE* aFile ) const = 0; - // Some geometric transforms, that must be rewritten for derived classes /** * Function Move diff --git a/include/wxBasePcbFrame.h b/include/wxBasePcbFrame.h index 60b3c438a9..75e2f781ae 100644 --- a/include/wxBasePcbFrame.h +++ b/include/wxBasePcbFrame.h @@ -373,20 +373,45 @@ public: // loading footprints /** - * Function GetModuleLibrary + * Function loadFootprintFromLibrary + * loads @a aFootprintName from @a aLibraryPath. + * If found add the module is also added to the BOARD, just for good measure. * - * Read active libraries or one library to find and load a given module - * If found the module is linked to the tail of linked list of modules * @param aLibraryFullFilename - the full filename of the library to read. If empty, * all active libraries are read - * @param aModuleName = module name to load - * @param aDisplayMessageError = true to display an error message if any. + * + * @param aFootprintName is the footprint to load + * + * @param aDisplayError = true to display an error message if any. + * + * @return MODULE* - new module, or NULL + */ + MODULE* loadFootprintFromLibrary( const wxString& aLibraryPath, + const wxString& aFootprintName, bool aDisplayError ); + + MODULE* loadFootprintFromLibraries( const wxString& aFootprintName, + bool aDisplayError ); + + /** + * Function GetModuleLibrary + * scans active libraries to find and load @a aFootprintName. + * If found add the module is also added to the BOARD, just for good measure. + * + * @param aFootprintName is the footprint to load + * + * @param aDisplayError = true to display an error message if any. + * * @return a pointer to the new module, or NULL * */ - MODULE* GetModuleLibrary( const wxString& aLibraryFullFilename, - const wxString& aModuleName, - bool aDisplayMessageError ); + MODULE* GetModuleLibrary( const wxString& aLibraryPath, const wxString& aFootprintName, + bool aDisplayError ) + { + if( !aLibraryPath ) + return loadFootprintFromLibraries( aFootprintName, aDisplayError ); + else + return loadFootprintFromLibrary( aLibraryPath, aFootprintName, aDisplayError ); + } /** * Function Select_1_Module_From_List @@ -409,7 +434,8 @@ public: /** * Function Load_Module_From_Library - * Open a dialog to select a footprint, and load in in current board + * opens a dialog to select a footprint, and loads it into current board. + * * @param aLibrary = the library name to use, or empty string to search * in all loaded libraries * @param aUseFootprintViewer = true to show the option diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 547a57beee..365cfa7971 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -136,7 +136,6 @@ set(PCBNEW_SRCS hotkeys_board_editor.cpp hotkeys_module_editor.cpp initpcb.cpp - ioascii.cpp layer_widget.cpp librairi.cpp loadcmp.cpp diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h index 3dae2934c3..115b2140e6 100644 --- a/pcbnew/class_board.h +++ b/pcbnew/class_board.h @@ -892,8 +892,6 @@ public: /***************************************************************************/ - bool Save( FILE* aFile ) const; - wxString GetClass() const { return wxT( "BOARD" ); diff --git a/pcbnew/class_board_connected_item.h b/pcbnew/class_board_connected_item.h index 431487c732..b2355ba249 100644 --- a/pcbnew/class_board_connected_item.h +++ b/pcbnew/class_board_connected_item.h @@ -135,14 +135,8 @@ public: */ } - bool Save( FILE* aFile ) const - { - return true; - } - //---------------------------------- - /** * Function GetCount * returns the number of BOARD_ITEMs. diff --git a/pcbnew/class_dimension.h b/pcbnew/class_dimension.h index 648484ed8b..249cfd748b 100644 --- a/pcbnew/class_dimension.h +++ b/pcbnew/class_dimension.h @@ -88,10 +88,6 @@ public: */ void AdjustDimensionDetails( bool aDoNotChangeText = false ); - bool ReadDimensionDescr( LINE_READER* aReader ); - - bool Save( FILE* aFile ) const; - void SetText( const wxString& NewText ); const wxString GetText() const; diff --git a/pcbnew/class_drawsegment.h b/pcbnew/class_drawsegment.h index 166c965763..fb32619e9c 100644 --- a/pcbnew/class_drawsegment.h +++ b/pcbnew/class_drawsegment.h @@ -152,10 +152,6 @@ public: m_PolyPoints = aPoints; } - bool Save( FILE* aFile ) const; - - bool ReadDrawSegmentDescr( LINE_READER* aReader ); - void Copy( DRAWSEGMENT* source ); void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, diff --git a/pcbnew/class_edge_mod.h b/pcbnew/class_edge_mod.h index 32cf0c00cd..f626fa35d0 100644 --- a/pcbnew/class_edge_mod.h +++ b/pcbnew/class_edge_mod.h @@ -64,10 +64,6 @@ public: void SetEnd0( const wxPoint& aPoint ) { m_End0 = aPoint; } const wxPoint& GetEnd0() const { return m_End0; } - bool Save( FILE* aFile ) const; - - int ReadDescr( LINE_READER* aReader ); - void SetDrawCoord(); /* drawing functions */ diff --git a/pcbnew/class_marker_pcb.h b/pcbnew/class_marker_pcb.h index a8d6b80129..05cd95e434 100644 --- a/pcbnew/class_marker_pcb.h +++ b/pcbnew/class_marker_pcb.h @@ -70,13 +70,6 @@ public: void DisplayInfo( EDA_DRAW_FRAME* frame ); - bool Save( FILE* aFile ) const - { - // not implemented, this is here to satisfy BOARD_ITEM::Save() - // "pure" virtual-ness - return true; - } - wxString GetSelectMenuText() const; BITMAP_DEF GetMenuImage() const { return drc_xpm; } diff --git a/pcbnew/class_mire.h b/pcbnew/class_mire.h index ab4aa42251..8d73f92163 100644 --- a/pcbnew/class_mire.h +++ b/pcbnew/class_mire.h @@ -86,10 +86,6 @@ public: void Flip( const wxPoint& aCentre ); - bool Save( FILE* aFile ) const; - - bool ReadMirePcbDescr( LINE_READER* aReader ); - void Copy( PCB_TARGET* source ); void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, int aDrawMode, diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp index 27f0be46c7..bc5c615786 100644 --- a/pcbnew/class_module.cpp +++ b/pcbnew/class_module.cpp @@ -111,6 +111,7 @@ MODULE::MODULE( const MODULE& aModule ) : // Copy reference and value. m_Reference = new TEXTE_MODULE( *aModule.m_Reference ); m_Reference->SetParent( this ); + m_Value = new TEXTE_MODULE( *aModule.m_Value ); m_Value->SetParent( this ); diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h index 246fc04953..135b0f8f1b 100644 --- a/pcbnew/class_module.h +++ b/pcbnew/class_module.h @@ -108,16 +108,6 @@ public: wxString m_Doc; // Module Description (info for users) wxString m_KeyWord; // Keywords to select the module in lib - // Local tolerances. When zero, this means the corresponding netclass value - // is used. Usually theses local tolerances zero, in deference to the - // corresponding netclass values. - int m_LocalClearance; - int m_LocalSolderMaskMargin; ///< Solder mask margin - int m_LocalSolderPasteMargin; ///< Solder paste margin - ///< absolute value - - double m_LocalSolderPasteMarginRatio; ///< Solder mask margin ratio - ///< value of pad size // The final margin is the sum of these 2 values ZoneConnection m_ZoneConnection; @@ -236,14 +226,6 @@ public: void SetLastEditTime( long aTime ) { m_LastEdit_Time = aTime; } long GetLastEditTime() const { return m_LastEdit_Time; } - /* Reading and writing data on files */ - - bool Save( FILE* aFile ) const; - - int Write_3D_Descr( FILE* File ) const; - - int ReadDescr( LINE_READER* aReader ); - /** * Function Read_GPCB_Descr * reads a footprint description in GPCB format (newlib version) @@ -358,7 +340,18 @@ public: #if defined(DEBUG) void Show( int nestLevel, std::ostream& os ) const; // overload #endif + +private: + // Local tolerances. When zero, this means the corresponding netclass value + // is used. Usually theses local tolerances zero, in deference to the + // corresponding netclass values. + int m_LocalClearance; + int m_LocalSolderMaskMargin; ///< Solder mask margin + int m_LocalSolderPasteMargin; ///< Solder paste margin + ///< absolute value + + double m_LocalSolderPasteMarginRatio; ///< Solder mask margin ratio + ///< value of pad size }; - #endif // MODULE_H_ diff --git a/pcbnew/class_netclass.h b/pcbnew/class_netclass.h index e5f0923d4e..73fab5c8a1 100644 --- a/pcbnew/class_netclass.h +++ b/pcbnew/class_netclass.h @@ -198,22 +198,6 @@ public: */ void SetParams( const NETCLASS* defaults = NULL ); - /** - * Function Save - * writes the data structures for this object out to a FILE in "*.brd" format. - * @param aFile The FILE to write to. - * @return bool - true if success writing else false. - */ - bool Save( FILE* aFile ) const; - - /** - * Function ReadDescr - * reads the data structures for this object from a LINE_READER in "*.brd" format. - * @param aReader is a pointer to a LINE_READER to read from. - * @return bool - true if success reading else false. - */ - bool ReadDescr( LINE_READER* aReader ); - /** * Function Format * outputs the net class to \a aFormatter in s-expression form. diff --git a/pcbnew/class_netinfo.h b/pcbnew/class_netinfo.h index 9df1b27c04..b5242a38b4 100644 --- a/pcbnew/class_netinfo.h +++ b/pcbnew/class_netinfo.h @@ -342,18 +342,6 @@ public: #endif - /* Reading and writing data on files */ - int ReadDescr( LINE_READER* aReader ); - - /** - * Function Save - * writes the data structures for this object out to a FILE in "*.brd" - * format. - * @param aFile The FILE to write to. - * @return bool - true if success writing else false. - */ - bool Save( FILE* aFile ) const; - /** * Function Draw * @todo we actually could show a NET, simply show all the tracks and diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp index 13cebb1509..cd9ae27c5f 100644 --- a/pcbnew/class_pad.cpp +++ b/pcbnew/class_pad.cpp @@ -332,9 +332,10 @@ int D_PAD::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const int clearance = m_LocalClearance; if( clearance == 0 ) - { // If local clearance is 0, use the parent footprint clearance value - if( GetParent() && ( (MODULE*) GetParent() )->m_LocalClearance ) - clearance = ( (MODULE*) GetParent() )->m_LocalClearance; + { + // If local clearance is 0, use the parent footprint clearance value + if( GetParent() && GetParent()->GetLocalClearance() ) + clearance = GetParent()->GetLocalClearance(); } if( clearance == 0 ) // If the parent footprint clearance value = 0, use NETCLASS value @@ -367,14 +368,14 @@ int D_PAD::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const int D_PAD::GetSolderMaskMargin() { int margin = m_LocalSolderMaskMargin; - MODULE* module = (MODULE*) GetParent(); + MODULE* module = GetParent(); if( module ) { if( margin == 0 ) { - if( module->m_LocalSolderMaskMargin ) - margin = module->m_LocalSolderMaskMargin; + if( module->GetLocalSolderMaskMargin() ) + margin = module->GetLocalSolderMaskMargin(); } if( margin == 0 ) @@ -408,26 +409,26 @@ int D_PAD::GetSolderMaskMargin() */ wxSize D_PAD::GetSolderPasteMargin() { - int margin = m_LocalSolderPasteMargin; - double mratio = m_LocalSolderPasteMarginRatio; - MODULE * module = (MODULE*) GetParent(); + int margin = m_LocalSolderPasteMargin; + double mratio = m_LocalSolderPasteMarginRatio; + MODULE* module = GetParent(); if( module ) { - if( margin == 0 ) - margin = module->m_LocalSolderPasteMargin; + if( margin == 0 ) + margin = module->GetLocalSolderPasteMargin(); BOARD * brd = GetBoard(); - if( margin == 0 ) + if( margin == 0 ) margin = brd->GetDesignSettings().m_SolderPasteMargin; if( mratio == 0.0 ) - mratio = module->m_LocalSolderPasteMarginRatio; + mratio = module->GetLocalSolderPasteMarginRatio(); if( mratio == 0.0 ) { - mratio = brd->GetDesignSettings().m_SolderPasteMarginRatio; + mratio = brd->GetDesignSettings().m_SolderPasteMarginRatio; } } diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h index c2577d8f51..92b5c76e14 100644 --- a/pcbnew/class_pad.h +++ b/pcbnew/class_pad.h @@ -267,12 +267,6 @@ public: void SetThermalGap( int aGap ) { m_ThermalGap = aGap; } int GetThermalGap() const; - /* Reading and writing data on files */ - int ReadDescr( LINE_READER* aReader ); - - bool Save( FILE* aFile ) const; - - /* drawing functions */ void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode, const wxPoint& aOffset = ZeroOffset ); diff --git a/pcbnew/class_pcb_text.h b/pcbnew/class_pcb_text.h index c21bfca413..7df987a65e 100644 --- a/pcbnew/class_pcb_text.h +++ b/pcbnew/class_pcb_text.h @@ -73,11 +73,6 @@ public: void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, int aDrawMode, const wxPoint& offset = ZeroOffset ); - // File Operations: - int ReadTextePcbDescr( LINE_READER* aReader ); - - bool Save( FILE* aFile ) const; - void DisplayInfo( EDA_DRAW_FRAME* frame ); bool HitTest( const wxPoint& aPosition ) diff --git a/pcbnew/class_text_mod.h b/pcbnew/class_text_mod.h index b64cd788be..e2f4136cbd 100644 --- a/pcbnew/class_text_mod.h +++ b/pcbnew/class_text_mod.h @@ -116,16 +116,6 @@ public: void SetLocalCoord(); // Set relative coordinates. - bool Save( FILE* aFile ) const; - - /** - * Function ReadDescr - * Read description from a given line in "*.brd" format. - * @param aReader is a pointer to a LINE_READER to read from. - * @return int - > 0 if success reading else 0. - */ - int ReadDescr( LINE_READER* aReader ); - /* drawing functions */ void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h index 7974d6ec24..328c1e0eb1 100644 --- a/pcbnew/class_track.h +++ b/pcbnew/class_track.h @@ -125,8 +125,6 @@ public: EDA_RECT GetBoundingBox() const; - bool Save( FILE* aFile ) const; - /** * Function GetBestInsertPoint * searches the "best" insertion point within the track linked list. diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h index a3d93c5642..a7bea558d0 100644 --- a/pcbnew/class_zone.h +++ b/pcbnew/class_zone.h @@ -135,16 +135,6 @@ public: ~ZONE_CONTAINER(); - bool Save( FILE* aFile ) const; - - /** - * Function ReadDescr - * reads the data structures for this object from a LINE_READER in "*.brd" format. - * @param aReader is a pointer to a LINE_READER to read from. - * @return int - 1 if success, 0 if not. - */ - int ReadDescr( LINE_READER* aReader ); - /** * Function GetPosition * @return a wxPoint, position of the first point of the outline diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp index 3c7652aea8..227e8799f6 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp @@ -110,8 +110,8 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties() m_SolderMaskMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); m_SolderPasteMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); - PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_CurrentModule->m_LocalClearance ); - PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_CurrentModule->m_LocalSolderMaskMargin ); + PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_CurrentModule->GetLocalClearance() ); + PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_CurrentModule->GetLocalSolderMaskMargin() ); // These 2 parameters are usually < 0, so prepare entering a negative // value, if current is 0 diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp index 7b78f02849..2f39cc06eb 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp @@ -149,8 +149,9 @@ void DIALOG_MODULE_MODULE_EDITOR::InitModeditProperties() m_SolderPasteMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); wxString msg; - PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_CurrentModule->m_LocalClearance ); - PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_CurrentModule->m_LocalSolderMaskMargin ); + PutValueInLocalUnits( *m_NetClearanceValueCtrl, m_CurrentModule->GetLocalClearance() ); + PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_CurrentModule->GetLocalSolderMaskMargin() ); + // These 2 parameters are usually < 0, so prepare entering a negative value, if current is 0 PutValueInLocalUnits( *m_SolderPasteMarginCtrl, m_CurrentModule->GetLocalSolderPasteMargin() ); diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 488ff3556f..803e07f8dd 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -202,70 +202,6 @@ the changes?" ) ) ) GetScreen()->SetFileName( fileName.GetFullPath() ); -#if !defined(USE_NEW_PCBNEW_LOAD) - - // Start read PCB file - FILE* source = wxFopen( GetScreen()->GetFileName(), wxT( "rt" ) ); - - if( source == NULL ) - { - msg.Printf( _( "File <%s> not found" ), GetChars( GetScreen()->GetFileName() ) ); - DisplayError( this, msg ); - return false; - } - - FILE_LINE_READER fileReader( source, GetScreen()->GetFileName() ); - - FILTER_READER reader( fileReader ); - - // Read header and TEST if it is a PCB file format - reader.ReadLine(); - - if( strncmp( reader.Line(), "PCBNEW-BOARD", 12 ) != 0 ) - { - DisplayError( this, wxT( "Unknown file type" ) ); - return false; - } - - int ver; - sscanf( reader.Line() , "PCBNEW-BOARD Version %d date", &ver ); - - if ( ver > LEGACY_BOARD_FILE_VERSION ) - { - DisplayInfoMessage( this, _( "This file was created by a more recent \ -version of Pcbnew and may not load correctly. Please consider updating!" ) ); - } - else if ( ver < LEGACY_BOARD_FILE_VERSION ) - { - DisplayInfoMessage( this, _( "This file was created by an older \ -version of Pcbnew. It will be stored in the new file format when you save \ -this file again." ) ); - } - - // Reload the corresponding configuration file: - wxSetWorkingDirectory( wxPathOnly( GetScreen()->GetFileName() ) ); - - if( aAppend ) - { - ReadPcbFile( &reader, true ); - } - else - { - // Update the option toolbar - m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill; - m_DisplayModText = DisplayOpt.DisplayModText; - m_DisplayModEdge = DisplayOpt.DisplayModEdge; - m_DisplayPadFill = DisplayOpt.DisplayPadFill; - m_DisplayViaFill = DisplayOpt.DisplayViaFill; - - // load project settings before BOARD, in case BOARD file has overrides. - LoadProjectSettings( GetScreen()->GetFileName() ); - - ReadPcbFile( &reader, false ); - } - -#else - if( !aAppend ) { // Update the option toolbar @@ -321,8 +257,6 @@ this file again." ) ); BestZoom(); } -#endif - GetScreen()->ClrModify(); // If append option: change the initial board name to -append.brd @@ -456,10 +390,8 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF pcbFileName = GetScreen()->GetFileName(); -#if defined( USE_NEW_PCBNEW_LOAD ) || defined( USE_NEW_PCBNEW_SAVE ) if( pcbFileName.GetExt().IsEmpty() ) pcbFileName.SetExt( IO_MGR::GetFileExtension( (IO_MGR::PCB_FILE_T) wildcardIndex ) ); -#endif if( !IsWritable( pcbFileName ) ) return false; @@ -493,8 +425,6 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF } } -#if defined(USE_NEW_PCBNEW_SAVE) - GetBoard()->m_Status_Pcb &= ~CONNEXION_OK; GetBoard()->SynchronizeNetsAndNetClasses(); @@ -535,29 +465,6 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF UpdateTitle(); } -#else - // Create the file - FILE* dest; - dest = wxFopen( pcbFileName.GetFullPath(), wxT( "wt" ) ); - - if( dest == 0 ) - { - msg = _( "Unable to create " ) + pcbFileName.GetFullPath(); - DisplayError( this, msg ); - saveok = false; - } - - if( dest ) - { - GetScreen()->SetFileName( pcbFileName.GetFullPath() ); - UpdateTitle(); - - SavePcbFormatAscii( dest ); - fclose( dest ); - } - -#endif - // Display the file names: m_messagePanel->EraseMsgBox(); diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp index 45334a7d4f..9d47667a62 100644 --- a/pcbnew/gen_modules_placefile.cpp +++ b/pcbnew/gen_modules_placefile.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -532,7 +533,6 @@ void PCB_EDIT_FRAME::GenFootprintsReport( wxCommandEvent& event ) */ bool PCB_EDIT_FRAME::DoGenFootprintsReport( const wxString& aFullFilename, bool aUnitsMM ) { - MODULE* Module; D_PAD* pad; char line[1024]; wxString fnFront, msg; @@ -550,9 +550,7 @@ bool PCB_EDIT_FRAME::DoGenFootprintsReport( const wxString& aFullFilename, bool double conv_unit = aUnitsMM ? conv_unit_mm : conv_unit_inch; const char *unit_text = aUnitsMM ? unit_text_mm : unit_text_inch; - // Switch the locale to standard C (needed to print floating point - // numbers like 1.3) - SetLocaleTo_C_standard(); + LOCALE_IO toggle; // Generate header file comments.) sprintf( line, "## Module report - date %s\n", TO_UTF8( DateAndTime() ) ); @@ -584,103 +582,114 @@ bool PCB_EDIT_FRAME::DoGenFootprintsReport( const wxString& aFullFilename, bool fputs( "$EndBOARD\n\n", rptfile ); - Module = (MODULE*) GetBoard()->m_Modules; - - for( ; Module != NULL; Module = Module->Next() ) + try { - sprintf( line, "$MODULE %s\n", EscapedUTF8( Module->m_Reference->m_Text ).c_str() ); - fputs( line, rptfile ); + PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) ); - sprintf( line, "reference %s\n", EscapedUTF8( Module->m_Reference->m_Text ).c_str() ); - fputs( line, rptfile ); - sprintf( line, "value %s\n", EscapedUTF8( Module->m_Value->m_Text ).c_str() ); - fputs( line, rptfile ); - sprintf( line, "footprint %s\n", EscapedUTF8( Module->m_LibRef ).c_str() ); - fputs( line, rptfile ); + LEGACY_PLUGIN* legacy = (LEGACY_PLUGIN*) (PLUGIN*) pi; - msg = wxT( "attribut" ); + legacy->SetFilePtr( rptfile ); - if( Module->m_Attributs & MOD_VIRTUAL ) - msg += wxT( " virtual" ); - - if( Module->m_Attributs & MOD_CMS ) - msg += wxT( " smd" ); - - if( ( Module->m_Attributs & (MOD_VIRTUAL | MOD_CMS) ) == 0 ) - msg += wxT( " none" ); - - msg += wxT( "\n" ); - fputs( TO_UTF8( msg ), rptfile ); - - module_pos = Module->m_Pos; - module_pos.x -= File_Place_Offset.x; - module_pos.y -= File_Place_Offset.y; - - sprintf( line, "position %9.6f %9.6f\n", - module_pos.x * conv_unit, - module_pos.y * conv_unit ); - fputs( line, rptfile ); - - sprintf( line, "orientation %.2f\n", (double) Module->m_Orient / 10 ); - - if( Module->GetLayer() == LAYER_N_FRONT ) - strcat( line, "layer component\n" ); - else if( Module->GetLayer() == LAYER_N_BACK ) - strcat( line, "layer copper\n" ); - else - strcat( line, "layer other\n" ); - - fputs( line, rptfile ); - - Module->Write_3D_Descr( rptfile ); - - for( pad = Module->m_Pads; pad != NULL; pad = pad->Next() ) + for( MODULE* Module = GetBoard()->m_Modules; Module; Module = Module->Next() ) { - fprintf( rptfile, "$PAD \"%s\"\n", TO_UTF8( pad->GetPadName() ) ); + sprintf( line, "$MODULE %s\n", EscapedUTF8( Module->m_Reference->m_Text ).c_str() ); + fputs( line, rptfile ); + + sprintf( line, "reference %s\n", EscapedUTF8( Module->m_Reference->m_Text ).c_str() ); + fputs( line, rptfile ); + sprintf( line, "value %s\n", EscapedUTF8( Module->m_Value->m_Text ).c_str() ); + fputs( line, rptfile ); + sprintf( line, "footprint %s\n", EscapedUTF8( Module->m_LibRef ).c_str() ); + fputs( line, rptfile ); + + msg = wxT( "attribut" ); + + if( Module->m_Attributs & MOD_VIRTUAL ) + msg += wxT( " virtual" ); + + if( Module->m_Attributs & MOD_CMS ) + msg += wxT( " smd" ); + + if( ( Module->m_Attributs & (MOD_VIRTUAL | MOD_CMS) ) == 0 ) + msg += wxT( " none" ); + + msg += wxT( "\n" ); + fputs( TO_UTF8( msg ), rptfile ); + + module_pos = Module->m_Pos; + module_pos.x -= File_Place_Offset.x; + module_pos.y -= File_Place_Offset.y; + sprintf( line, "position %9.6f %9.6f\n", - pad->GetPos0().x * conv_unit, - pad->GetPos0().y * conv_unit ); + module_pos.x * conv_unit, + module_pos.y * conv_unit ); fputs( line, rptfile ); - sprintf( line, "size %9.6f %9.6f\n", - pad->GetSize().x * conv_unit, - pad->GetSize().y * conv_unit ); + sprintf( line, "orientation %.2f\n", (double) Module->m_Orient / 10 ); + + if( Module->GetLayer() == LAYER_N_FRONT ) + strcat( line, "layer component\n" ); + else if( Module->GetLayer() == LAYER_N_BACK ) + strcat( line, "layer copper\n" ); + else + strcat( line, "layer other\n" ); + fputs( line, rptfile ); - sprintf( line, "drill %9.6f\n", pad->GetDrillSize().x * conv_unit ); - fputs( line, rptfile ); + legacy->SaveModule3D( Module ); - sprintf( line, "shape_offset %9.6f %9.6f\n", - pad->GetOffset().x * conv_unit, - pad->GetOffset().y * conv_unit ); - fputs( line, rptfile ); + for( pad = Module->m_Pads; pad != NULL; pad = pad->Next() ) + { + fprintf( rptfile, "$PAD \"%s\"\n", TO_UTF8( pad->GetPadName() ) ); + sprintf( line, "position %9.6f %9.6f\n", + pad->GetPos0().x * conv_unit, + pad->GetPos0().y * conv_unit ); + fputs( line, rptfile ); - sprintf( line, "orientation %.2f\n", - double(pad->GetOrientation() - Module->GetOrientation()) / 10 ); - fputs( line, rptfile ); + sprintf( line, "size %9.6f %9.6f\n", + pad->GetSize().x * conv_unit, + pad->GetSize().y * conv_unit ); + fputs( line, rptfile ); - static const char* shape_name[6] = { "??? ", "Circ", "Rect", "Oval", "trap", "spec" }; + sprintf( line, "drill %9.6f\n", pad->GetDrillSize().x * conv_unit ); + fputs( line, rptfile ); - sprintf( line, "Shape %s\n", shape_name[pad->GetShape()] ); - fputs( line, rptfile ); + sprintf( line, "shape_offset %9.6f %9.6f\n", + pad->GetOffset().x * conv_unit, + pad->GetOffset().y * conv_unit ); + fputs( line, rptfile ); - int layer = 0; + sprintf( line, "orientation %.2f\n", + double(pad->GetOrientation() - Module->GetOrientation()) / 10 ); + fputs( line, rptfile ); - if( pad->GetLayerMask() & LAYER_BACK ) - layer = 1; + static const char* shape_name[6] = { "??? ", "Circ", "Rect", "Oval", "trap", "spec" }; - if( pad->GetLayerMask() & LAYER_FRONT ) - layer |= 2; + sprintf( line, "Shape %s\n", shape_name[pad->GetShape()] ); + fputs( line, rptfile ); - static const char* layer_name[4] = { "??? ", "copper", "component", "all" }; + int layer = 0; - sprintf( line, "Layer %s\n", layer_name[layer] ); - fputs( line, rptfile ); - fprintf( rptfile, "$EndPAD\n" ); + if( pad->GetLayerMask() & LAYER_BACK ) + layer = 1; + + if( pad->GetLayerMask() & LAYER_FRONT ) + layer |= 2; + + static const char* layer_name[4] = { "??? ", "copper", "component", "all" }; + + sprintf( line, "Layer %s\n", layer_name[layer] ); + fputs( line, rptfile ); + fprintf( rptfile, "$EndPAD\n" ); + } + + fprintf( rptfile, "$EndMODULE %s\n\n", + TO_UTF8(Module->m_Reference->m_Text ) ); } - - fprintf( rptfile, "$EndMODULE %s\n\n", - TO_UTF8(Module->m_Reference->m_Text ) ); + } + catch( IO_ERROR ioe ) + { + DisplayError( NULL, ioe.errorText ); } // Write board Edges @@ -700,7 +709,6 @@ bool PCB_EDIT_FRAME::DoGenFootprintsReport( const wxString& aFullFilename, bool // Generate EOF. fputs( "$EndDESCRIPTION\n", rptfile ); fclose( rptfile ); - SetLocaleTo_Default( ); // revert to the current locale return true; } diff --git a/pcbnew/io_mgr.cpp b/pcbnew/io_mgr.cpp index 4b8e2fac40..0112ae3978 100644 --- a/pcbnew/io_mgr.cpp +++ b/pcbnew/io_mgr.cpp @@ -170,7 +170,7 @@ MODULE* PLUGIN::FootprintLoad( const wxString& aLibraryPath, const wxString& aFo } -void PLUGIN::FootprintSave( const wxString& aLibraryPath, MODULE* aFootprint, PROPERTIES* aProperties ) +void PLUGIN::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint, PROPERTIES* aProperties ) { // not pure virtual so that plugins only have to implement subset of the PLUGIN interface. THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED, PluginName().GetData() , __FUNCTION__ ) ); @@ -184,7 +184,21 @@ void PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxString& aFoo } -bool PLUGIN::IsLibraryWritable( const wxString& aLibraryPath ) +void PLUGIN::FootprintLibCreate( const wxString& aLibraryPath, PROPERTIES* aProperties ) +{ + // not pure virtual so that plugins only have to implement subset of the PLUGIN interface. + THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED, PluginName().GetData() , __FUNCTION__ ) ); +} + + +void PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, PROPERTIES* aProperties ) +{ + // not pure virtual so that plugins only have to implement subset of the PLUGIN interface. + THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED, PluginName().GetData() , __FUNCTION__ ) ); +} + + +bool PLUGIN::IsFootprintLibWritable( const wxString& aLibraryPath ) { // not pure virtual so that plugins only have to implement subset of the PLUGIN interface. THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED, PluginName().GetData() , __FUNCTION__ ) ); diff --git a/pcbnew/io_mgr.h b/pcbnew/io_mgr.h index 67d88d2bf1..cf5b667033 100644 --- a/pcbnew/io_mgr.h +++ b/pcbnew/io_mgr.h @@ -153,7 +153,9 @@ public: * is a base class that BOARD loading and saving plugins should derive from. * Implementations can provide either Load() or Save() functions, or both. * PLUGINs throw exceptions, so it is best that you wrap your calls to these - * functions in a try catch block. + * functions in a try catch block. Plugins throw exceptions because it is illegal + * for them to have any user interface calls in them whatsoever, i.e. no windowing + * or screen printing at all. * * 
  *   try
@@ -188,9 +190,9 @@ public:
 
     /**
      * Function Load
-     * loads a board file, or a portion of one, from some input file format
-     * that this PLUGIN implementation knows about. This may be used to load an
-     * entire new BOARD, or to augment an existing one if \a aAppendToMe is not NULL.
+     * loads information from some input file format that this PLUGIN implementation
+     * knows about, into either a new BOARD or an existing one. This may be used to load an
+     * entire new BOARD, or to augment an existing one if @a aAppendToMe is not NULL.
      *
      * @param aFileName is the name of the file to use as input and may be foreign in
      *  nature or native in nature.
@@ -217,7 +219,7 @@ public:
 
     /**
      * Function Save
-     * will write a full aBoard to a storage file in a format that this
+     * will write @a aBoard to a storage file in a format that this
      * PLUGIN implementation knows about, or it can be used to write a portion of
      * aBoard to a special kind of export file.
      *
@@ -242,7 +244,7 @@ public:
      * Function FootprintEnumerate
      * returns a list of footprint names contained within the library at @a aLibraryPath.
      *
-     * @param aLibraryPath is locator for the "library", usually a directory
+     * @param aLibraryPath is a locator for the "library", usually a directory
      *   or file containing several footprints.
      *
      * @param aProperties is an associative array that can be used to tell the
@@ -262,7 +264,7 @@ public:
      * loads a MODULE having @a aFootprintName from the @a aLibraryPath containing
      * a library format that this PLUGIN knows about.
      *
-     * @param aLibraryPath is locator for the "library", usually a directory
+     * @param aLibraryPath is a locator for the "library", usually a directory
      *   or file containing several footprints.
      *
      * @param aFootprintName is the name of the footprint to load.
@@ -273,21 +275,20 @@ public:
      *  The caller continues to own this object (plugin may not delete it), and
      *  plugins should expect it to be optionally NULL.
      *
-     * @return  MODULE* - caller owns it.  Never NULL because exception thrown if error.
+     * @return  MODULE* - if found caller owns it, else NULL if not found.
      *
-     * @throw   IO_ERROR if the PLUGIN cannot be found, library cannot be found,
-     *          or footprint cannot be loaded.
+     * @throw   IO_ERROR if the library cannot be found or read.  No exception
+     *          is thrown in the case where aFootprintName cannot be found.
      */
     virtual MODULE* FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName,
                                     PROPERTIES* aProperties = NULL );
 
     /**
      * Function FootprintSave
-     * will write @a aModule to an existing library located at @a aLibraryPath,
-     * and create the library if it doesn't exist then perform the write.  If a
-     * footprint by the same name already exists, it is replaced.
+     * will write @a aModule to an existing library located at @a aLibraryPath.
+     * If a footprint by the same name already exists, it is replaced.
      *
-     * @param aLibraryPath is locator for the "library", usually a directory
+     * @param aLibraryPath is a locator for the "library", usually a directory
      *      or file containing several footprints. This is where the footprint is
      *      to be stored.
      *
@@ -302,14 +303,14 @@ public:
      *
      * @throw IO_ERROR if there is a problem saving.
      */
-    virtual void FootprintSave( const wxString& aLibraryPath, MODULE* aFootprint,
+    virtual void FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint,
                                     PROPERTIES* aProperties = NULL );
 
     /**
      * Function FootprintDelete
      * deletes the @a aFootprintName from the library at @a aLibraryPath.
      *
-     * @param aLibraryPath is locator for the "library", usually a directory
+     * @param aLibraryPath is a locator for the "library", usually a directory
      *   or file containing several footprints.
      *
      * @param aFootprintName is the name of a footprint to delete from the specificed library.
@@ -319,11 +320,48 @@ public:
     virtual void FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName );
 
     /**
-     * Function IsLibraryWritable
+     * Function FootprintLibCreate
+     * creates a new empty footprint library at @a aLibraryPath empty.  It is an
+     * error to attempt to create an existing library or to attempt to create
+     * on a "read only" location.
+     *
+     * @param aLibraryPath is a locator for the "library", usually a directory
+     *   or file which will contain footprints.
+     *
+     * @param aProperties is an associative array that can be used to tell the
+     *  library create function anything special, because it can take any number of
+     *  additional named tuning arguments that the plugin is known to support.
+     *  The caller continues to own this object (plugin may not delete it), and
+     *  plugins should expect it to be optionally NULL.
+     *
+     * @throw IO_ERROR if there is a problem finding the library, or creating it.
+     */
+    virtual void FootprintLibCreate( const wxString& aLibraryPath, PROPERTIES* aProperties = NULL );
+
+    /**
+     * Function FootprintLibDelete
+     * deletes an existing footprint library, or complains if it cannot delete it or if it
+     * does not exist.
+     *
+     * @param aLibraryPath is a locator for the "library", usually a directory
+     *   or file which will contain footprints.
+     *
+     * @param aProperties is an associative array that can be used to tell the
+     *  library create function anything special, because it can take any number of
+     *  additional named tuning arguments that the plugin is known to support.
+     *  The caller continues to own this object (plugin may not delete it), and
+     *  plugins should expect it to be optionally NULL.
+     *
+     * @throw IO_ERROR if there is a problem finding the library, or deleting it.
+     */
+    virtual void FootprintLibDelete( const wxString& aLibraryPath, PROPERTIES* aProperties = NULL );
+
+    /**
+     * Function IsFootprintLibWritable
      * returns true iff the library at @a aLibraryPath is writable.  (Often
      * system libraries are read only because of where they are installed.)
      */
-    virtual bool IsLibraryWritable( const wxString& aLibraryPath );
+    virtual bool IsFootprintLibWritable( const wxString& aLibraryPath );
 
     //-----------------------------------------------------
 
diff --git a/pcbnew/ioascii.cpp b/pcbnew/ioascii.cpp.notused
similarity index 100%
rename from pcbnew/ioascii.cpp
rename to pcbnew/ioascii.cpp.notused
diff --git a/pcbnew/item_io.cpp b/pcbnew/item_io.cpp.notused
similarity index 100%
rename from pcbnew/item_io.cpp
rename to pcbnew/item_io.cpp.notused
diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp
index e44f5c9105..8caed9fe1c 100644
--- a/pcbnew/legacy_plugin.cpp
+++ b/pcbnew/legacy_plugin.cpp
@@ -2,7 +2,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2007-2011 SoftPLC Corporation, Dick Hollenbeck 
+ * Copyright (C) 2007-2012 SoftPLC Corporation, Dick Hollenbeck 
  * Copyright (C) 2004 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.fr
  * Copyright (C) 1992-2011 KiCad Developers, see change_log.txt for contributors.
 
@@ -98,6 +98,8 @@
 #define SZ( x )         (sizeof(x)-1)
 
 
+//--------------------------------------------------------
+
 /// C string compare test for a specific length of characters.
 #define TESTLINE( x )   ( !strnicmp( line, x, SZ( x ) ) && isspace( line[SZ( x )] ) )
 
@@ -345,7 +347,7 @@ void LEGACY_PLUGIN::loadGENERAL()
 
             if( !strcmp( data, "mm" ) )
             {
-#if defined(USE_PCBNEW_NANOMETRES)
+#if defined( USE_PCBNEW_NANOMETRES )
                 diskToBiu = 1000000.0;
 
 #elif defined(DEBUG)
@@ -940,7 +942,7 @@ MODULE* LEGACY_PLUGIN::LoadMODULE()
 
         else if( TESTLINE( "Li" ) )         // Library name of footprint
         {
-            module->m_LibRef = FROM_UTF8( StrPurge( line + SZ( "Li" ) ) );
+            module->SetLibRef( FROM_UTF8( StrPurge( line + SZ( "Li" ) ) ) );
         }
 
         else if( TESTLINE( "Sc" ) )         // timestamp
@@ -2679,13 +2681,12 @@ void LEGACY_PLUGIN::init( PROPERTIES* aProperties )
     m_props = aProperties;
 
     // conversion factor for saving RAM BIUs to KICAD legacy file format.
-#if defined(USE_PCBNEW_NANOMETRES)
+#if defined( USE_PCBNEW_NANOMETRES )
     biuToDisk = 1/1000000.0;        // BIUs are nanometers & file is mm
 #else
     biuToDisk = 1.0;                // BIUs are deci-mils
 #endif
 
-
     // conversion factor for loading KICAD legacy file format into BIUs in RAM
 
     // Start by assuming the *.brd file is in deci-mils.
@@ -2693,7 +2694,7 @@ void LEGACY_PLUGIN::init( PROPERTIES* aProperties )
     // then, during the file loading process, to start a conversion from
     // mm to nanometers.
 
-#if defined(USE_PCBNEW_NANOMETRES)
+#if defined( USE_PCBNEW_NANOMETRES )
     diskToBiu = 2540.0;             // BIUs are nanometers
 #else
     diskToBiu = 1.0;                // BIUs are deci-mils
@@ -2701,7 +2702,7 @@ void LEGACY_PLUGIN::init( PROPERTIES* aProperties )
 }
 
 
-//------------------------------------------------------------
+//--------------------------------------------------------
 
 void LEGACY_PLUGIN::Save( const wxString& aFileName, BOARD* aBoard, PROPERTIES* aProperties )
 {
@@ -2768,7 +2769,7 @@ void LEGACY_PLUGIN::saveGENERAL() const
     fprintf( m_fp, "encoding utf-8\n" );
 
     // tell folks the units used within the file, as early as possible here.
-#if defined(USE_PCBNEW_NANOMETRES)
+#if defined( USE_PCBNEW_NANOMETRES )
     fprintf( m_fp, "Units mm\n" );
 #else
     fprintf( m_fp, "Units deci-mils\n" );
@@ -2958,7 +2959,7 @@ void LEGACY_PLUGIN::saveBOARD() const
 
     // save the modules
     for( MODULE* m = m_board->m_Modules;  m;  m = (MODULE*) m->Next() )
-        saveMODULE( m );
+        SaveMODULE( m );
 
     // save the graphics owned by the board (not owned by a module)
     for( BOARD_ITEM* gr = m_board->m_Drawings;  gr;  gr = gr->Next() )
@@ -3231,8 +3232,9 @@ void LEGACY_PLUGIN::savePAD( const D_PAD* me ) const
     if( me->GetLocalSolderPasteMargin() != 0 )
         fprintf( m_fp, ".SolderPaste %s\n", fmtBIU( me->GetLocalSolderPasteMargin() ).c_str() );
 
-    if( me->GetLocalSolderPasteMarginRatio() != 0 )
-        fprintf( m_fp, ".SolderPasteRatio %g\n", me->GetLocalSolderPasteMarginRatio() );
+    double ratio = me->GetLocalSolderPasteMarginRatio();
+    if( ratio != 0.0 )
+        fprintf( m_fp, ".SolderPasteRatio %g\n", ratio );
 
     if( me->GetLocalClearance() != 0 )
         fprintf( m_fp, ".LocalClearance %s\n", fmtBIU( me->GetLocalClearance( ) ).c_str() );
@@ -3252,7 +3254,7 @@ void LEGACY_PLUGIN::savePAD( const D_PAD* me ) const
 }
 
 
-void LEGACY_PLUGIN::saveMODULE( const MODULE* me ) const
+void LEGACY_PLUGIN::SaveMODULE( const MODULE* me ) const
 {
     char        statusTxt[3];
     double      orient = me->GetOrientation();
@@ -3293,8 +3295,9 @@ void LEGACY_PLUGIN::saveMODULE( const MODULE* me ) const
     if( me->GetLocalSolderPasteMargin() != 0 )
         fprintf( m_fp, ".SolderPaste %s\n", fmtBIU( me->GetLocalSolderPasteMargin() ).c_str() );
 
-    if( me->GetLocalSolderPasteMarginRatio() != 0 )
-        fprintf( m_fp, ".SolderPasteRatio %g\n", me->GetLocalSolderPasteMarginRatio() );
+    double ratio = me->GetLocalSolderPasteMarginRatio();
+    if( ratio != 0.0 )
+        fprintf( m_fp, ".SolderPasteRatio %g\n", ratio );
 
     if( me->GetLocalClearance() != 0 )
         fprintf( m_fp, ".LocalClearance %s\n", fmtBIU( me->GetLocalClearance( ) ).c_str() );
@@ -3345,7 +3348,7 @@ void LEGACY_PLUGIN::saveMODULE( const MODULE* me ) const
     for( D_PAD* pad = me->m_Pads;  pad;  pad = pad->Next() )
         savePAD( pad );
 
-    save3D( me );
+    SaveModule3D( me );
 
     fprintf( m_fp, "$EndMODULE %s\n", TO_UTF8( me->GetLibRef() ) );
 
@@ -3353,7 +3356,7 @@ void LEGACY_PLUGIN::saveMODULE( const MODULE* me ) const
 }
 
 
-void LEGACY_PLUGIN::save3D( const MODULE* me ) const
+void LEGACY_PLUGIN::SaveModule3D( const MODULE* me ) const
 {
     for( S3D_MASTER* t3D = me->m_3D_Drawings;  t3D;  t3D = t3D->Next() )
     {
@@ -3722,8 +3725,6 @@ typedef boost::ptr_map< wxString, MODULE >      MODULE_MAP;
 typedef MODULE_MAP::iterator                    MODULE_ITER;
 typedef MODULE_MAP::const_iterator              MODULE_CITER;
 
-#define FOOTPRINT_LIBRARY_HEADER       "PCBNEW-LibModule-V1"
-
 
 /**
  * Class FPL_CACHE
@@ -3736,13 +3737,13 @@ struct FPL_CACHE
     LEGACY_PLUGIN*  m_owner;        // my owner, I need its LEGACY_PLUGIN::LoadMODULE()
     wxString        m_lib_name;
     wxDateTime      m_mod_time;
-    MODULE_MAP      m_modules;      // tuple of footprint name vs. MODULE*
+    MODULE_MAP      m_modules;      // map or tuple of footprint_name vs. MODULE*
     bool            m_writable;
 
     FPL_CACHE( LEGACY_PLUGIN* aOwner, const wxString& aLibraryPath );
 
-    // Most all functions in this class throw IO_ERROR exceptions.  There is no
-    // error codes nor user interface calls from here.
+    // Most all functions in this class throw IO_ERROR exceptions.  There are no
+    // error codes nor user interface calls from here, nor in any PLUGIN.
     // Catch these exceptions higher up please.
 
     /// save the entire legacy library to m_lib_name;
@@ -3754,9 +3755,12 @@ struct FPL_CACHE
 
     void SaveModules( FILE* aFile );
 
-    void SaveEndOfFile( FILE* aFile );
+    void SaveEndOfFile( FILE* aFile )
+    {
+        fprintf( aFile, "$EndLIBRARY\n" );
+    }
 
-    void Load( LINE_READER* aReader );
+    void Load();
 
     void ReadAndVerifyHeader( LINE_READER* aReader );
 
@@ -3771,19 +3775,8 @@ struct FPL_CACHE
 FPL_CACHE::FPL_CACHE( LEGACY_PLUGIN* aOwner, const wxString& aLibraryPath ) :
     m_owner( aOwner ),
     m_lib_name( aLibraryPath ),
-    m_writable( false )
+    m_writable( true )
 {
-    FILE* fp = wxFopen( aLibraryPath, wxT( "r" ) );
-    if( !fp )
-    {
-        THROW_IO_ERROR( wxString::Format(
-            _( "Unable to open legacy library file '%s'" ), aLibraryPath.GetData() ) );
-    }
-
-    // reader now owns fp, will close on exception or return
-    FILE_LINE_READER    reader( fp, aLibraryPath );
-
-    Load( &reader );
 }
 
 
@@ -3791,17 +3784,29 @@ wxDateTime FPL_CACHE::GetLibModificationTime()
 {
     wxFileName  fn( m_lib_name );
 
+    // update the writable flag while we have a wxFileName, in a network this
+    // is possibly quite dynamic anyway.
     m_writable = fn.IsFileWritable();
 
     return fn.GetModificationTime();
 }
 
 
-void FPL_CACHE::Load( LINE_READER* aReader )
+void FPL_CACHE::Load()
 {
-    ReadAndVerifyHeader( aReader );
-    SkipIndex( aReader );
-    LoadModules( aReader );
+    FILE* fp = wxFopen( m_lib_name, wxT( "r" ) );
+    if( !fp )
+    {
+        THROW_IO_ERROR( wxString::Format(
+            _( "Unable to open legacy library file '%s'" ), m_lib_name.GetData() ) );
+    }
+
+    // reader now owns fp, will close on exception or return
+    FILE_LINE_READER    reader( fp, m_lib_name );
+
+    ReadAndVerifyHeader( &reader );
+    SkipIndex( &reader );
+    LoadModules( &reader );
 
     // Remember the file modification time of library file when the
     // cache snapshot was made, so that in a networked environment we will
@@ -3812,17 +3817,45 @@ void FPL_CACHE::Load( LINE_READER* aReader )
 
 void FPL_CACHE::ReadAndVerifyHeader( LINE_READER* aReader )
 {
+    char* line;
+
     if( !aReader->ReadLine() )
+        goto L_bad_library;
+
+    line = aReader->Line();
+    if( !TESTLINE( "PCBNEW-LibModule-V1" ) )
+        goto L_bad_library;
+
+    while( aReader->ReadLine() )
     {
-    L_not_library:
-        THROW_IO_ERROR( wxString::Format( _( "File %s is empty or is not a legacy library" ),
-            m_lib_name.GetData() ) );
+        line = aReader->Line();
+        if( TESTLINE( "Units" ) )
+        {
+            const char* units = strtok( line + SZ( "Units" ), delims );
+
+            if( !strcmp( units, "mm" ) )
+            {
+#if defined( USE_PCBNEW_NANOMETRES )
+                m_owner->diskToBiu = 1000000.0;
+
+#elif defined(DEBUG)
+                // mm to deci-mils:
+                // advanced testing of round tripping only, not supported in non DEBUG build
+                m_owner->diskToBiu = 10000/25.4;
+
+#else
+                THROW_IO_ERROR( _( "May not load millimeter legacy library file into 'PCBNew compiled for deci-mils'" ) );
+#endif
+            }
+
+        }
+        else if( TESTLINE( "$INDEX" ) )
+            return;
     }
 
-    char* line = aReader->Line();
-
-    if( !TESTLINE( "PCBNEW-LibModule-V1" ) )
-        goto L_not_library;
+L_bad_library:
+    THROW_IO_ERROR( wxString::Format( _( "File '%s' is empty or is not a legacy library" ),
+        m_lib_name.GetData() ) );
 }
 
 
@@ -3833,7 +3866,7 @@ void FPL_CACHE::SkipIndex( LINE_READER* aReader )
     // to see if this is not a new $INDEX tag.
     bool exit = false;
 
-    while( aReader->ReadLine() )
+    do
     {
         char* line = aReader->Line();
 
@@ -3854,7 +3887,7 @@ void FPL_CACHE::SkipIndex( LINE_READER* aReader )
         }
         else if( exit )
             break;
-    }
+    } while( aReader->ReadLine() );
 }
 
 
@@ -3871,17 +3904,20 @@ void FPL_CACHE::LoadModules( LINE_READER* aReader )
         {
             MODULE* m = m_owner->LoadMODULE();
 
-            wxString reference = m->GetReference();
+            // wxString footprintName = m->GetReference();
+            wxString footprintName = m->GetLibRef();
 
-            MODULE_CITER it = m_modules.find( reference );
+            std::pair r = m_modules.insert( footprintName, m );
 
-            if( it != m_modules.end() )
+            // m's module is gone here, both on success or failure of insertion.
+            // no memory leak, container deleted m on failure.
+
+            if( !r.second )
             {
                 THROW_IO_ERROR( wxString::Format(
-                    _( "library %s has a duplicate footprint named %s" ),
-                    m_lib_name.GetData(), reference.GetData() ) );
+                    _( "library '%s' has a duplicate footprint named '%s'" ),
+                    m_lib_name.GetData(), footprintName.GetData() ) );
             }
-            m_modules.insert( reference, m );
         }
 
     } while( aReader->ReadLine() );
@@ -3904,7 +3940,8 @@ void FPL_CACHE::Save()
     if( !fp )
     {
         THROW_IO_ERROR( wxString::Format(
-            _( "Unable to open legacy library file '%s'" ), m_lib_name.GetData() ) );
+            _( "Unable to open or create legacy library file '%s'" ),
+            m_lib_name.GetData() ) );
     }
 
     // wxf now owns fp, will close on exception or return
@@ -3915,8 +3952,15 @@ void FPL_CACHE::Save()
     SaveModules( fp );
     SaveEndOfFile( fp );
 
-    wxRemoveFile( m_lib_name );
-    wxRenameFile( tempFileName, m_lib_name );
+    wxRemove( m_lib_name );     // it is not an error if this does not exist
+
+    if( wxRename( tempFileName, m_lib_name ) )
+    {
+        THROW_IO_ERROR( wxString::Format(
+            _( "Unable to rename tempfile '%s' to to library file '%s'" ),
+            tempFileName.GetData(),
+            m_lib_name.GetData() ) );
+    }
 }
 
 
@@ -3924,6 +3968,11 @@ void FPL_CACHE::SaveHeader( FILE* aFile )
 {
     fprintf( aFile, "%s  %s\n", FOOTPRINT_LIBRARY_HEADER, TO_UTF8( DateAndTime() ) );
     fprintf( aFile, "# encoding utf-8\n" );
+#if defined( USE_PCBNEW_NANOMETRES )
+    fprintf( aFile, "Units mm\n" );
+#else
+    fprintf( aFile, "Units deci-mils\n" );
+#endif
 }
 
 
@@ -3942,24 +3991,32 @@ void FPL_CACHE::SaveIndex( FILE* aFile )
 
 void FPL_CACHE::SaveModules( FILE* aFile )
 {
+    m_owner->SetFilePtr( aFile );
+
+    for( MODULE_CITER it = m_modules.begin();  it != m_modules.end();  ++it )
+    {
+        m_owner->SaveMODULE( it->second );
+    }
 }
 
 
 void LEGACY_PLUGIN::cacheLib( const wxString& aLibraryPath )
 {
     if( !m_cache || m_cache->m_lib_name != aLibraryPath ||
+        // somebody else on a network touched the library:
         m_cache->m_mod_time != m_cache->GetLibModificationTime() )
     {
-        // a spectacular episode in memory management.
+        // a spectacular episode in memory management:
         delete m_cache;
         m_cache = new FPL_CACHE( this, aLibraryPath );
+        m_cache->Load();
     }
 }
 
 
 wxArrayString LEGACY_PLUGIN::FootprintEnumerate( const wxString& aLibraryPath, PROPERTIES* aProperties )
 {
-    wxArrayString   ret;
+    LOCALE_IO   toggle;     // toggles on, then off, the C locale.
 
     init( aProperties );
 
@@ -3967,6 +4024,8 @@ wxArrayString LEGACY_PLUGIN::FootprintEnumerate( const wxString& aLibraryPath, P
 
     const MODULE_MAP&   mods = m_cache->m_modules;
 
+    wxArrayString   ret;
+
     for( MODULE_CITER it = mods.begin();  it != mods.end();  ++it )
     {
         ret.Add( it->first );
@@ -3979,6 +4038,8 @@ wxArrayString LEGACY_PLUGIN::FootprintEnumerate( const wxString& aLibraryPath, P
 MODULE* LEGACY_PLUGIN::FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName,
                                     PROPERTIES* aProperties )
 {
+    LOCALE_IO   toggle;     // toggles on, then off, the C locale.
+
     init( aProperties );
 
     cacheLib( aLibraryPath );
@@ -3989,8 +4050,12 @@ MODULE* LEGACY_PLUGIN::FootprintLoad( const wxString& aLibraryPath, const wxStri
 
     if( it == mods.end() )
     {
+        /*
         THROW_IO_ERROR( wxString::Format( _( "No '%s' footprint in library '%s'" ),
             aFootprintName.GetData(), aLibraryPath.GetData() ) );
+        */
+
+        return NULL;
     }
 
     // copy constructor to clone the already loaded MODULE
@@ -3998,30 +4063,45 @@ MODULE* LEGACY_PLUGIN::FootprintLoad( const wxString& aLibraryPath, const wxStri
 }
 
 
-void LEGACY_PLUGIN::FootprintSave( const wxString& aLibraryPath, MODULE* aFootprint, PROPERTIES* aProperties )
+void LEGACY_PLUGIN::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint, PROPERTIES* aProperties )
 {
+    LOCALE_IO   toggle;     // toggles on, then off, the C locale.
+
     init( aProperties );
 
     cacheLib( aLibraryPath );
 
     if( !m_cache->m_writable )
     {
+        THROW_IO_ERROR( wxString::Format( _( "Library '%s' is read only" ), aLibraryPath.GetData() ) );
     }
 
-    wxString reference = aFootprint->GetReference();
+    wxString footprintName = aFootprint->GetLibRef();
 
     MODULE_MAP&  mods = m_cache->m_modules;
 
     // quietly overwrite any by same name.
-    MODULE_CITER it = mods.find( reference );
+    MODULE_CITER it = mods.find( footprintName );
     if( it != mods.end() )
     {
-        mods.erase( reference );
+        mods.erase( footprintName );
     }
 
-    aFootprint->SetParent( 0 );
+    // I need my own copy for the cache
+    MODULE* my_module = new MODULE( *aFootprint );
 
-    mods.insert( reference, aFootprint );
+    // and it's time stamp must be 0, it should have no parent, orientation should
+    // be zero, and it should be on the front layer.
+
+    my_module->SetTimeStamp( 0 );
+    my_module->SetParent( 0 );
+
+    my_module->SetOrientation( 0 );
+
+    if( my_module->GetLayer() != LAYER_N_FRONT )
+        my_module->Flip( my_module->GetPosition() );
+
+    mods.insert( footprintName, my_module );
 
     m_cache->Save();
 }
@@ -4029,12 +4109,15 @@ void LEGACY_PLUGIN::FootprintSave( const wxString& aLibraryPath, MODULE* aFootpr
 
 void LEGACY_PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName )
 {
+    LOCALE_IO   toggle;     // toggles on, then off, the C locale.
+
     init( NULL );
 
     cacheLib( aLibraryPath );
 
     if( !m_cache->m_writable )
     {
+        THROW_IO_ERROR( wxString::Format( _( "Library '%s' is read only" ), aLibraryPath.GetData() ) );
     }
 
     size_t erasedCount = m_cache->m_modules.erase( aFootprintName );
@@ -4050,8 +4133,52 @@ void LEGACY_PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxStrin
 }
 
 
-bool LEGACY_PLUGIN::IsLibraryWritable( const wxString& aLibraryPath )
+void LEGACY_PLUGIN::FootprintLibCreate( const wxString& aLibraryPath, PROPERTIES* aProperties )
 {
+    if( wxFileExists( aLibraryPath ) )
+    {
+        THROW_IO_ERROR( wxString::Format(
+            _( "library '%s' already exists, will not create anew" ),
+            aLibraryPath.GetData() ) );
+    }
+
+    LOCALE_IO   toggle;
+
+    init( NULL );
+
+    delete m_cache;
+    m_cache = new FPL_CACHE( this, aLibraryPath );
+    m_cache->Save();
+    m_cache->Load();    // update m_writable and m_mod_time
+}
+
+
+void LEGACY_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, PROPERTIES* aProperties )
+{
+    wxFileName fn = aLibraryPath;
+
+    if( !fn.FileExists() )
+    {
+        THROW_IO_ERROR( wxString::Format(
+            _( "library '%s' does not exist, cannot be deleted" ),
+            aLibraryPath.GetData() ) );
+    }
+
+    // Some of the more elaborate wxRemoveFile() crap puts up its own wxLog dialog
+    // we don't want that.  we want bare metal portability with no UI here.
+    if( wxRemove( aLibraryPath ) )
+    {
+        THROW_IO_ERROR( wxString::Format(
+            _( "library '%s' cannot be deleted" ),
+            aLibraryPath.GetData() ) );
+    }
+}
+
+
+bool LEGACY_PLUGIN::IsFootprintLibWritable( const wxString& aLibraryPath )
+{
+    LOCALE_IO   toggle;
+
     init( NULL );
 
     cacheLib( aLibraryPath );
diff --git a/pcbnew/legacy_plugin.h b/pcbnew/legacy_plugin.h
index b2011b8fe8..0aaa458208 100644
--- a/pcbnew/legacy_plugin.h
+++ b/pcbnew/legacy_plugin.h
@@ -27,6 +27,10 @@
 #include 
 #include 
 
+
+#define FOOTPRINT_LIBRARY_HEADER       "PCBNEW-LibModule-V1"
+#define FOOTPRINT_LIBRARY_HEADER_CNT   18
+
 typedef int     BIU;
 
 class PCB_TARGET;
@@ -44,7 +48,7 @@ class EDGE_MODULE;
 class TRACK;
 class SEGZONE;
 class D_PAD;
-class FPL_CACHE;
+struct FPL_CACHE;
 
 
 /**
@@ -54,6 +58,7 @@ class FPL_CACHE;
  */
 class LEGACY_PLUGIN : public PLUGIN
 {
+    friend struct FPL_CACHE;
 
 public:
 
@@ -80,12 +85,16 @@ public:
     MODULE* FootprintLoad( const wxString& aLibraryPath, const wxString& aFootprintName,
                                     PROPERTIES* aProperties = NULL );
 
-    void FootprintSave( const wxString& aLibraryPath, MODULE* aFootprint,
+    void FootprintSave( const wxString& aLibraryPath, const MODULE* aFootprint,
                                     PROPERTIES* aProperties = NULL );
 
     void FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName );
 
-    bool IsLibraryWritable( const wxString& aLibraryPath );
+    void FootprintLibCreate( const wxString& aLibraryPath, PROPERTIES* aProperties = NULL );
+
+    void FootprintLibDelete( const wxString& aLibraryPath, PROPERTIES* aProperties = NULL );
+
+    bool IsFootprintLibWritable( const wxString& aLibraryPath );
 
     //--------------------------------------------------
 
@@ -103,7 +112,8 @@ public:
     void SetFilePtr( FILE* aFile )              { m_fp = aFile; }
 
     MODULE* LoadMODULE();
-
+    void    SaveMODULE( const MODULE* aModule ) const;
+    void    SaveModule3D( const MODULE* aModule ) const;
 
 protected:
 
@@ -243,11 +253,9 @@ protected:
     void saveSETUP() const;
     void saveBOARD() const;
 
-    void saveMODULE( const MODULE* aModule ) const;
     void saveMODULE_TEXT( const TEXTE_MODULE* aText ) const;
     void saveMODULE_EDGE( const EDGE_MODULE* aGraphic ) const;
     void savePAD( const D_PAD* aPad ) const;
-    void save3D( const MODULE* aModule ) const;
 
     void saveNETINFO_ITEM( const NETINFO_ITEM* aNet ) const;
     void saveNETCLASSES() const;
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index 8845cda5a8..037f21afa5 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include               // temporarily, for LoadMODULE()
 
 
 /*
@@ -45,26 +46,24 @@ static const wxString ModImportFileWildcard( _( "GPcb foot print files (*)|*" )
 
 MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
 {
-    char*     Line;
-    FILE*     file;
-    MODULE*   module = NULL;
-    bool      Footprint_Is_GPCB_Format = false;
+    // use the clipboard for this in the future?
 
-    wxString  LastOpenedPathForLoading;
-    wxConfig* Config = wxGetApp().GetSettings();
+    wxString  lastOpenedPathForLoading;
+    wxConfig* config = wxGetApp().GetSettings();
 
-    if( Config )
-        Config->Read( EXPORT_IMPORT_LASTPATH_KEY, &LastOpenedPathForLoading );
+    if( config )
+        config->Read( EXPORT_IMPORT_LASTPATH_KEY, &lastOpenedPathForLoading );
 
     wxString importWildCard = ModExportFileWildcard + wxT("|") + ModImportFileWildcard;
+
     wxFileDialog dlg( this, _( "Import Footprint Module" ),
-                      LastOpenedPathForLoading, wxEmptyString,
+                      lastOpenedPathForLoading, wxEmptyString,
                       importWildCard, wxFD_OPEN | wxFD_FILE_MUST_EXIST );
 
     if( dlg.ShowModal() == wxID_CANCEL )
         return NULL;
 
-    file = wxFopen( dlg.GetPath(), wxT( "rt" ) );
+    FILE* file = wxFopen( dlg.GetPath(), wxT( "rt" ) );
 
     if( file == NULL )
     {
@@ -74,28 +73,29 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
         return NULL;
     }
 
+    if( config )    // Save file path
+    {
+        lastOpenedPathForLoading = wxPathOnly( dlg.GetPath() );
+        config->Write( EXPORT_IMPORT_LASTPATH_KEY, lastOpenedPathForLoading );
+    }
+
+    LOCALE_IO   toggle;
+
     FILE_LINE_READER fileReader( file, dlg.GetPath() );
 
     FILTER_READER reader( fileReader );
 
-    if( Config )    // Save file path
-    {
-        LastOpenedPathForLoading = wxPathOnly( dlg.GetPath() );
-        Config->Write( EXPORT_IMPORT_LASTPATH_KEY, LastOpenedPathForLoading );
-    }
-
-    // Switch the locale to standard C (needed to print floating point numbers like 1.3)
-    SetLocaleTo_C_standard();
-
     // Read header and test file type
     reader.ReadLine();
-    Line = reader.Line();
+    char* line = reader.Line();
 
-    if( strnicmp( Line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 )
+    bool      footprint_Is_GPCB_Format = false;
+
+    if( strnicmp( line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 )
     {
-        if( strnicmp( Line, "Element", 7 ) == 0 )
+        if( strnicmp( line, "Element", 7 ) == 0 )
         {
-            Footprint_Is_GPCB_Format = true;
+            footprint_Is_GPCB_Format = true;
         }
         else
         {
@@ -105,27 +105,41 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
     }
 
     // Read file: Search the description starting line (skip lib header)
-    if( !Footprint_Is_GPCB_Format )
+    if( !footprint_Is_GPCB_Format )
     {
         while( reader.ReadLine() )
         {
-            if( strnicmp( Line, "$MODULE", 7 ) == 0 )
+            if( strnicmp( line, "$MODULE", 7 ) == 0 )
                 break;
         }
     }
 
-    module = new MODULE( GetBoard() );
+    MODULE*   module;
 
-    if( Footprint_Is_GPCB_Format )
+    if( footprint_Is_GPCB_Format )
     {
+        // @todo GEDA plugin
+        module = new MODULE( GetBoard() );
         module->Read_GPCB_Descr( dlg.GetPath() );
     }
     else
     {
-        module->ReadDescr( &reader );
-    }
+        try
+        {
+            PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
 
-    SetLocaleTo_Default();       // revert to the current locale
+            LEGACY_PLUGIN*  lp = (LEGACY_PLUGIN*)(PLUGIN*)pi;
+
+            lp->SetReader( &reader );
+
+            module = lp->LoadMODULE();
+        }
+        catch( IO_ERROR ioe )
+        {
+            DisplayError( this, ioe.errorText );
+            return NULL;
+        }
+    }
 
     // Insert footprint in list
     GetBoard()->Add( module );
@@ -143,9 +157,8 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
 void FOOTPRINT_EDIT_FRAME::Export_Module( MODULE* aModule, bool aCreateSysLib )
 {
     wxFileName fn;
-    FILE*      file;
     wxString   msg, path, title, wildcard;
-    wxConfig*  Config = wxGetApp().GetSettings();
+    wxConfig*  config = wxGetApp().GetSettings();
 
     if( aModule == NULL )
         return;
@@ -155,12 +168,14 @@ void FOOTPRINT_EDIT_FRAME::Export_Module( MODULE* aModule, bool aCreateSysLib )
 
     if( aCreateSysLib )
         path = wxGetApp().ReturnLastVisitedLibraryPath();
-    else if( Config )
-        Config->Read( EXPORT_IMPORT_LASTPATH_KEY, &path );
+    else if( config )
+        config->Read( EXPORT_IMPORT_LASTPATH_KEY, &path );
 
-    fn.SetPath( path );
     title    = aCreateSysLib ? _( "Create New Library" ) : _( "Export Module" );
     wildcard = aCreateSysLib ?  FootprintLibFileWildcard : ModExportFileWildcard;
+
+    fn.SetPath( path );
+
     wxFileDialog dlg( this, msg, fn.GetPath(), fn.GetFullName(),
                       wxGetTranslation( wildcard ),
                       wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
@@ -171,64 +186,53 @@ void FOOTPRINT_EDIT_FRAME::Export_Module( MODULE* aModule, bool aCreateSysLib )
     fn = dlg.GetPath();
     wxGetApp().SaveLastVisitedLibraryPath( fn.GetPath() );
 
-    if( ( file = wxFopen( fn.GetFullPath(), wxT( "wt" ) ) ) == NULL )
+    if( !aCreateSysLib && config )  // Save file path
     {
-        msg.Printf( _( "Unable to create <%s>" ), GetChars( fn.GetFullPath() ) );
-        DisplayError( this, msg );
+        config->Write( EXPORT_IMPORT_LASTPATH_KEY, fn.GetPath() );
+    }
+
+    wxString libName = fn.GetFullPath();
+
+    try
+    {
+        // @todo : hard code this as IO_MGR::KICAD plugin, what would be the reason to "export"
+        // any other single footprint type, with clipboard support coming?
+        // Use IO_MGR::LEGACY for now, until the IO_MGR::KICAD plugin is ready.
+        PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
+
+        pi->FootprintLibCreate( libName );
+        pi->FootprintSave( libName, aModule );
+    }
+    catch( IO_ERROR ioe )
+    {
+        DisplayError( this, ioe.errorText );
         return;
     }
 
-    if( !aCreateSysLib && Config )  // Save file path
-    {
-        Config->Write( EXPORT_IMPORT_LASTPATH_KEY, fn.GetPath() );
-    }
-
-    // Switch the locale to standard C (needed to read/write floating point numbers like 1.3)
-    SetLocaleTo_C_standard();
-
-    FOOTPRINT_LIBRARY libexport( file );
-    libexport.WriteHeader();
-    libexport.m_List.Add(aModule->m_LibRef);
-    libexport.WriteSectionIndex();
-
-    GetBoard()->m_Modules->Save( file );
-
-    libexport.WriteEndOfFile();
-    fclose( file );
-
-    SetLocaleTo_Default();       // revert to the current locale
-
-    msg.Printf( _( "Module exported in file <%s>" ), GetChars( fn.GetFullPath() ) );
+    msg.Printf( _( "Module exported in file <%s>" ), libName.GetData() );
     DisplayInfoMessage( this, msg );
 }
 
 
-void FOOTPRINT_EDIT_FRAME::Delete_Module_In_Library( const wxString& aLibname )
+void FOOTPRINT_EDIT_FRAME::Delete_Module_In_Library( const wxString& aLibName )
 {
-    wxFileName newFileName;
-    wxFileName oldFileName;
-    int        LineNum = 0;
-    char       Line[1024], Name[256];
-    FILE*      out_file, * lib_module;
-    wxString   CmpName, msg;
+    wxString footprintName = Select_1_Module_From_List( this, aLibName, wxEmptyString, wxEmptyString );
 
-    CmpName = Select_1_Module_From_List( this, aLibname, wxEmptyString, wxEmptyString );
-
-    if( CmpName == wxEmptyString )
+    if( footprintName == wxEmptyString )
         return;
 
     // Confirmation
-    msg.Printf( _( "Ok to delete module %s in library %s" ),
-                GetChars( CmpName ), GetChars( aLibname ) );
+    wxString msg = wxString::Format( _( "Ok to delete module '%s' in library '%s'" ),
+                        footprintName.GetData(), aLibName.GetData() );
 
     if( !IsOK( this, msg ) )
         return;
 
     try
     {
-        PLUGIN::HOLDER  pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
+        PLUGIN::RELEASER  pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
 
-        pi->FootprintDelete( aLibname, CmpName );
+        pi->FootprintDelete( aLibName, footprintName );
     }
     catch( IO_ERROR ioe )
     {
@@ -236,8 +240,9 @@ void FOOTPRINT_EDIT_FRAME::Delete_Module_In_Library( const wxString& aLibname )
         return;
     }
 
-    msg.Printf( _( "Component %s deleted in library %s" ), GetChars( CmpName ),
-                GetChars( oldFileName.GetFullPath() ) );
+    msg.Printf( _( "Component '%s' deleted from library '%s'" ),
+                footprintName.GetData(), aLibName.GetData() );
+
     SetStatusText( msg );
 }
 
@@ -260,7 +265,7 @@ void PCB_EDIT_FRAME::ArchiveModulesOnBoard( const wxString& aLibName, bool aNewM
 
     path = wxGetApp().ReturnLastVisitedLibraryPath();
 
-    if( aLibName.IsEmpty() )
+    if( !aLibName )
     {
         wxFileDialog dlg( this, _( "Library" ), path,
                           wxEmptyString,
@@ -275,12 +280,12 @@ void PCB_EDIT_FRAME::ArchiveModulesOnBoard( const wxString& aLibName, bool aNewM
 
     wxFileName fn( fileName );
     wxGetApp().SaveLastVisitedLibraryPath( fn.GetPath() );
-    bool       file_exists = wxFileExists( fileName );
+    bool       lib_exists = wxFileExists( fileName );
 
-    if( !aNewModulesOnly && file_exists )
+    if( !aNewModulesOnly && lib_exists )
     {
         wxString msg;
-        msg.Printf( _( "File %s exists, OK to replace ?" ), GetChars( fileName ) );
+        msg.Printf( _( "Library %s exists, OK to replace ?" ), GetChars( fileName ) );
 
         if( !IsOK( this, msg ) )
             return;
@@ -288,51 +293,46 @@ void PCB_EDIT_FRAME::ArchiveModulesOnBoard( const wxString& aLibName, bool aNewM
 
     m_canvas->SetAbortRequest( false );
 
-    // Create a new, empty library if no old lib, or if archive all modules
-    if( !aNewModulesOnly || !file_exists )
+    try
     {
-        FILE* lib_module;
+        PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
 
-        if( ( lib_module = wxFopen( fileName, wxT( "w+t" ) ) )  == NULL )
+        // Delete old library if we're replacing it entirely.
+        if( lib_exists && !aNewModulesOnly )
         {
-            wxString msg;
-            msg.Printf( _( "Unable to create <%s>" ), GetChars(fileName) );
-            DisplayError( this, msg );
-            return;
+            pi->FootprintLibDelete( fileName );
+            lib_exists = false;
         }
 
-        FOOTPRINT_LIBRARY new_lib( lib_module );
-        new_lib.WriteHeader();
-        new_lib.WriteSectionIndex();
-        new_lib.WriteEndOfFile();
-        fclose( lib_module );
+        if( !lib_exists )
+        {
+            pi->FootprintLibCreate( fileName );
+        }
+
+        if( !aNewModulesOnly )
+        {
+            for( MODULE* m = GetBoard()->m_Modules;  m;  m = m->Next() )
+            {
+                pi->FootprintSave( fileName, m );
+            }
+        }
+        else
+        {
+            for( MODULE* m = GetBoard()->m_Modules;  m;  m = m->Next() )
+            {
+                if( !Save_Module_In_Library( fileName, m, false, false ) )
+                    break;
+
+                // Check for request to stop backup (ESCAPE key actuated)
+                if( m_canvas->GetAbortRequest() )
+                    break;
+            }
+        }
     }
-
-    MODULE*  module = (MODULE*) GetBoard()->m_Modules;
-    for( int ii = 1; module != NULL; ii++, module = module->Next() )
+    catch( IO_ERROR ioe )
     {
-        // Save footprints in default orientation (0.0) and default layer (FRONT layer)
-        int orient = module->GetOrientation();
-        if ( orient != 0 )
-            module->SetOrientation( 0 );
-        int layer = module->GetLayer();
-        if(layer != LAYER_N_FRONT )
-            module->Flip( module->m_Pos );
-
-        bool success = Save_Module_In_Library( fileName, module,
-                                    aNewModulesOnly ? false : true, false );
-        // Restore previous orientation and/or side
-        if(layer != module->GetLayer() )
-            module->Flip( module->m_Pos );
-        if ( orient != 0 )
-            module->SetOrientation( orient );
-
-        if( !success )
-            break;
-
-        // Check for request to stop backup (ESCAPE key actuated)
-        if( m_canvas->GetAbortRequest() )
-            break;
+        DisplayError( this, ioe.errorText );
+        return;
     }
 }
 
@@ -342,202 +342,84 @@ bool PCB_BASE_FRAME::Save_Module_In_Library( const wxString& aLibName,
                                              bool            aOverwrite,
                                              bool            aDisplayDialog )
 {
-    wxFileName oldFileName;
-    wxFileName newFileName;
-    int        LineNum = 0, tmp;
-    char       Name[256], Line[1024];
-    wxString   Name_Cmp;
-    wxString   msg;
-    FILE*      lib_module, * dest;
-
     if( aModule == NULL )
         return false;
 
     aModule->DisplayInfo( this );
 
-    newFileName = aLibName;
-
-    if( !newFileName.FileExists( aLibName ) )
+    if( !wxFileExists( aLibName ) )
     {
-        msg.Printf( _( "Library <%s> not found." ), GetChars( aLibName ) );
+        wxString msg = wxString::Format( _( "Library <%s> not found." ),
+                            aLibName.GetData() );
         DisplayError( this, msg );
         return false;
     }
 
-    if( !IsWritable( newFileName ) )
+    if( !IsWritable( aLibName ) )
         return false;
 
-    // Ask for the footprint name in lib
-    Name_Cmp = aModule->m_LibRef;
+    // Ask what to use as the footprint name in the library
+    wxString footprintName = aModule->GetLibRef();
 
     if( aDisplayDialog )
     {
-        wxTextEntryDialog dlg( this, _( "Name:" ), _( "Save module" ), Name_Cmp );
+        wxTextEntryDialog dlg( this, _( "Name:" ), _( "Save Module" ), footprintName );
 
         if( dlg.ShowModal() != wxID_OK )
-            return false; // canceled by user
+            return false;                   // canceled by user
 
-        Name_Cmp = dlg.GetValue();
-        Name_Cmp.Trim( true );
-        Name_Cmp.Trim( false );
+        footprintName = dlg.GetValue();
+        footprintName.Trim( true );
+        footprintName.Trim( false );
 
-        if( Name_Cmp.IsEmpty() )
+        if( footprintName.IsEmpty() )
             return false;
 
-        aModule->m_LibRef = Name_Cmp;
+        aModule->SetLibRef( footprintName );
     }
 
     // Ensure this footprint has a libname
-    if( Name_Cmp.IsEmpty() )
+    if( footprintName.IsEmpty() )
     {
-        Name_Cmp = wxT("noname");
-        aModule->m_LibRef = Name_Cmp;
+        footprintName = wxT("noname");
+        aModule->SetLibRef( footprintName );
     }
 
-    if( ( lib_module = wxFopen( aLibName, wxT( "rt" ) ) ) == NULL )
+    MODULE*  module_exists = NULL;
+
+    try
     {
-        msg.Printf( _( "Unable to open <%s>" ), GetChars( aLibName ) );
-        DisplayError( this, msg );
-        return false;
-    }
+        PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
 
-    // Read library file
-    FOOTPRINT_LIBRARY input_lib( lib_module );
+        module_exists = pi->FootprintLoad( aLibName, footprintName );
 
-    if( ! input_lib.IsLibrary() )
-    {
-        fclose( lib_module );
-        msg.Printf( _( "File <%s> is not an Eeschema library" ), GetChars( aLibName ) );
-        DisplayError( this, msg );
-        return false;
-    }
-
-    // Read footprints in lib: - search for an existing footprint
-    input_lib.RebuildIndex();
-    bool module_exists = input_lib.FindInList( Name_Cmp );
-
-    if( module_exists )
-    {
-        // an existing footprint is found in current lib
-        if( aDisplayDialog )
+        if( module_exists )
         {
-            msg = _( "Module exists\n Line: " );
-            msg << LineNum;
-            SetStatusText( msg );
-        }
+            delete module_exists;
 
-        if( !aOverwrite )    // Do not save the given footprint: an old one exists
-        {
-            fclose( lib_module );
-            return true;
-        }
-    }
-
-    // Creates the new library
-
-    newFileName.SetExt( FILETMP_EXT );
-
-    if( ( dest = wxFopen( newFileName.GetFullPath(), wxT( "w+t" ) ) )  == NULL )
-    {
-        fclose( lib_module );
-        msg.Printf( _( "Unable to create <%s>" ), GetChars( newFileName.GetFullPath() ) );
-        DisplayError( this, msg );
-        return false;
-    }
-
-    wxBeginBusyCursor();
-
-    // Switch the locale to standard C (needed to print floating point numbers like 1.3)
-    SetLocaleTo_C_standard();
-
-    FOOTPRINT_LIBRARY output_lib( dest );
-    output_lib.m_List = input_lib.m_List;
-
-    if( ! module_exists )
-        output_lib.m_List.Add( Name_Cmp );
-
-    output_lib.SortList();
-
-    // Create the library header with a new date
-    output_lib.WriteHeader();
-    output_lib.WriteSectionIndex();
-
-    LineNum = 0;
-    rewind( lib_module);
-
-    // Copy footprints, until the old footprint to delete
-    bool skip_header = true;
-
-    while( GetLine( lib_module, Line, &LineNum ) )
-    {
-        StrPurge( Line );
-        if( strnicmp( Line, "$EndLIBRARY", 8 ) == 0 )
-            continue;
-
-        // Search for the beginning of module section:
-        if( skip_header )
-        {
-            if(  strnicmp( Line, "$MODULE", 7 ) == 0 )
-                skip_header = false;
-            else
-                continue;
-        }
-
-        if( strnicmp( Line, "$MODULE", 7 ) == 0 )
-        {
-            sscanf( Line + 7, " %s", Name );
-            msg = FROM_UTF8( Name );
-
-            if( msg.CmpNoCase( Name_Cmp ) == 0 )
+            // an existing footprint is found in current lib
+            if( aDisplayDialog )
             {
-                // skip old footprint descr (delete from the lib)
-                while( GetLine( lib_module, Line, &LineNum ) )
-                {
-                    if( strnicmp( Line, "$EndMODULE", 9 ) == 0 )
-                        break;
-                }
+                wxString msg = wxString::Format(
+                    _( "Footprint '%s' already exists in library '%s'" ),
+                    footprintName.GetData(), aLibName.GetData() );
 
-                continue;
+                SetStatusText( msg );
+            }
+
+            if( !aOverwrite )
+            {
+                // Do not save the given footprint: an old one exists
+                return true;
             }
         }
 
-        fprintf( dest, "%s\n", Line );
+        // this always overwrites any existing footprint
+        pi->FootprintSave( aLibName, aModule );
     }
-
-    // Write the new footprint ( append it to the list of footprint )
-    tmp = aModule->GetTimeStamp();
-    aModule->SetTimeStamp( 0 );
-    aModule->Save( dest );
-    aModule->SetTimeStamp( tmp );
-
-    output_lib.WriteEndOfFile();
-
-    fclose( dest );
-    fclose( lib_module );
-    SetLocaleTo_Default();       // revert to the current locale
-
-    wxEndBusyCursor();
-
-    // The old library file is renamed .bak
-    oldFileName = aLibName;
-    oldFileName.SetExt( BACKUP_EXT );
-
-    if( oldFileName.FileExists() )
-        wxRemoveFile( oldFileName.GetFullPath() );
-
-    if( !wxRenameFile( aLibName, oldFileName.GetFullPath() ) )
+    catch( IO_ERROR ioe )
     {
-        msg.Printf( _( "Could not create library back up file <%s>." ),
-                      GetChars( oldFileName.GetFullName() ) );
-        DisplayError( this, msg );
-    }
-
-    // The new library file is renamed
-    if( !wxRenameFile( newFileName.GetFullPath(), aLibName ) )
-    {
-        msg.Printf( _( "Could not create temporary library file <%s>." ),
-                      GetChars( aLibName ) );
-        DisplayError( this, msg );
+        DisplayError( this, ioe.errorText );
         return false;
     }
 
@@ -546,7 +428,8 @@ bool PCB_BASE_FRAME::Save_Module_In_Library( const wxString& aLibName,
         wxString fmt = module_exists ?
             _( "Component [%s] replaced in <%s>" ) :
             _( "Component [%s] added in  <%s>" );
-        msg.Printf( fmt, GetChars( Name_Cmp ), GetChars( aLibName ) );
+
+        wxString msg = wxString::Format( fmt, footprintName.GetData(), aLibName.GetData() );
         SetStatusText( msg );
     }
 
@@ -647,13 +530,14 @@ void FOOTPRINT_EDIT_FRAME::Select_Active_Library()
 
 int FOOTPRINT_EDIT_FRAME::CreateLibrary( const wxString& aLibName )
 {
-    FILE*    lib_module;
-    wxString msg;
     wxFileName fileName = aLibName;
 
     if( fileName.FileExists() )
     {
-        msg.Printf( _( "Library <%s> already exists." ), GetChars( fileName.GetFullPath() ) );
+        wxString msg = wxString::Format(
+            _( "Library <%s> already exists." ),
+            aLibName.GetData() );
+
         DisplayError( this, msg );
         return 0;
     }
@@ -661,18 +545,18 @@ int FOOTPRINT_EDIT_FRAME::CreateLibrary( const wxString& aLibName )
     if( !IsWritable( fileName ) )
         return 0;
 
-    if( ( lib_module = wxFopen( fileName.GetFullPath(), wxT( "wt" ) ) )  == NULL )
+    try
     {
-        msg.Printf( _( "Unable to create library <%s>" ), GetChars( fileName.GetFullPath() ) );
-        DisplayError( this, msg );
-        return -1;
+        PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
+
+        pi->FootprintLibCreate( aLibName );
+    }
+    catch( IO_ERROR ioe )
+    {
+        DisplayError( this, ioe.errorText );
+        return 0;
     }
 
-    FOOTPRINT_LIBRARY new_lib( lib_module );
-    new_lib.WriteHeader();
-    new_lib.WriteSectionIndex();
-    new_lib.WriteEndOfFile();
-    fclose( lib_module );
-
-    return 1;
+    return 1;       // remember how many times we succeeded
 }
+
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp
index b571f1176e..615ac1a322 100644
--- a/pcbnew/loadcmp.cpp
+++ b/pcbnew/loadcmp.cpp
@@ -42,11 +42,11 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -141,6 +141,7 @@ wxString PCB_BASE_FRAME::SelectFootprintFromLibBrowser( void )
     return fpname;
 }
 
+
 MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
                                                   bool aUseFootprintViewer,
                                                   wxDC* aDC )
@@ -148,7 +149,7 @@ MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
     MODULE*     module;
     wxPoint     curspos = GetScreen()->GetCrossHairPosition();
     wxString    moduleName, keys;
-    bool        AllowWildSeach = true;
+    bool        allowWildSeach = true;
 
     static wxArrayString HistoryList;
     static wxString      lastComponentName;
@@ -181,7 +182,7 @@ MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
 
     if( dlg.IsKeyword() )   // Selection by keywords
     {
-        AllowWildSeach = false;
+        allowWildSeach = false;
         keys = moduleName;
         moduleName = Select_1_Module_From_List( this, aLibrary, wxEmptyString, keys );
 
@@ -194,7 +195,7 @@ MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
     else if( ( moduleName.Contains( wxT( "?" ) ) )
             || ( moduleName.Contains( wxT( "*" ) ) ) )  // Selection wild card
     {
-        AllowWildSeach = false;
+        allowWildSeach = false;
         moduleName     = Select_1_Module_From_List( this, aLibrary, moduleName, wxEmptyString );
 
         if( moduleName.IsEmpty() )
@@ -206,11 +207,13 @@ MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
 
     module = GetModuleLibrary( aLibrary, moduleName, false );
 
-    if( ( module == NULL ) && AllowWildSeach )    // Search with wild card
+    if( !module && allowWildSeach )    // Search with wild card
     {
-        AllowWildSeach = false;
+        allowWildSeach = false;
+
         wxString wildname = wxChar( '*' ) + moduleName + wxChar( '*' );
         moduleName = wildname;
+
         moduleName = Select_1_Module_From_List( this, aLibrary, moduleName, wxEmptyString );
 
         if( moduleName.IsEmpty() )
@@ -233,14 +236,18 @@ MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
         AddHistoryComponentName( HistoryList, moduleName );
 
         module->SetFlags( IS_NEW );
-        module->m_Link      = 0;
+        module->m_Link = 0;
+
         module->SetTimeStamp( GetNewTimeStamp() );
         GetBoard()->m_Status_Pcb = 0;
+
         module->SetPosition( curspos );
+
         // Put it on FRONT layer,
         // (Can be stored on BACK layer if the lib is an archive built from a board)
         if( module->GetLayer() != LAYER_N_FRONT )
             module->Flip( module->m_Pos );
+
         // Put in in orientation 0,
         // even if it is not saved with with orientation 0 in lib
         // (Can happen if the lib is an archive built from a board)
@@ -256,117 +263,102 @@ MODULE* PCB_BASE_FRAME::Load_Module_From_Library( const wxString& aLibrary,
 }
 
 
-MODULE* PCB_BASE_FRAME::GetModuleLibrary( const wxString& aLibraryFullFilename,
-                                          const wxString& aModuleName,
-                                          bool            aDisplayMessageError )
+MODULE* PCB_BASE_FRAME::loadFootprintFromLibrary( const wxString& aLibraryPath,
+            const wxString& aFootprintName, bool aDisplayError )
 {
-    wxFileName fn;
-    wxString   msg, tmp;
-    MODULE*    newModule;
-    FILE*      file = NULL;
-    bool       error_set = false;
-
-    bool       one_lib = aLibraryFullFilename.IsEmpty() ? false : true;
-
-    for( unsigned ii = 0; ii < g_LibraryNames.GetCount(); ii++ )
+    try
     {
-        if( one_lib )
-            fn = aLibraryFullFilename;
-        else
-            fn = wxFileName( wxEmptyString, g_LibraryNames[ii], FootprintLibFileExtension );
+        PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
 
-        tmp = wxGetApp().FindLibraryPath( fn );
+        wxString libPath = wxGetApp().FindLibraryPath( aLibraryPath );
 
-        if( !tmp )
+        MODULE* footprint = pi->FootprintLoad( libPath, aFootprintName );
+
+        if( !footprint )
         {
-            if( aDisplayMessageError && !error_set )
+            if( aDisplayError )
             {
-                msg.Printf( _( "PCB footprint library file <%s> not found in search paths." ),
-                            GetChars( fn.GetFullName() ) );
-                wxMessageBox( msg, _( "Library Load Error" ), wxOK | wxICON_ERROR, this );
-                error_set = true;
+                wxString msg = wxString::Format(
+                    _( "Footprint '%s' not found in library '%s'" ),
+                    aFootprintName.GetData(),
+                    libPath.GetData() );
+
+                DisplayError( NULL, msg );
             }
 
-            continue;
-        }
-
-        file = wxFopen( tmp, wxT( "rt" ) );
-
-        if( file == NULL )
-        {
-            msg.Printf( _( "Could not open PCB footprint library file <%s>." ),
-                        GetChars( tmp ) );
-            wxMessageBox( msg, _( "Library Load Error" ), wxOK | wxICON_ERROR, this );
-            continue;
-        }
-
-        FILE_LINE_READER fileReader( file, tmp );
-
-        FILTER_READER reader( fileReader );
-
-        msg.Printf( _( "Scan Lib: %s" ), GetChars( tmp ) );
-        SetStatusText( msg );
-
-        FOOTPRINT_LIBRARY curr_lib( file, &reader );
-
-        if( !curr_lib.IsLibrary() )
-        {
-            msg.Printf( _( "<%s> is not a valid KiCad PCB footprint library file." ),
-                        GetChars( tmp ) );
-            wxMessageBox( msg, _( "Library Load Error" ), wxOK | wxICON_ERROR, this );
             return NULL;
         }
 
-        // Reading the list of modules in the library.
-        curr_lib.ReadSectionIndex();
-        bool found = curr_lib.FindInList( aModuleName );
+        GetBoard()->Add( footprint, ADD_APPEND );
+        SetStatusText( wxEmptyString );
+        return footprint;
+    }
+    catch( IO_ERROR ioe )
+    {
+        DisplayError( this, ioe.errorText );
+        return NULL;
+    }
+}
 
-        // Read library.
-        if( found  )
+
+MODULE* PCB_BASE_FRAME::loadFootprintFromLibraries(
+        const wxString& aFootprintName, bool aDisplayError )
+{
+    bool    showed_error = false;
+    MODULE* footprint = NULL;
+
+    try
+    {
+        PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
+
+        for( unsigned ii = 0; ii < g_LibraryNames.GetCount(); ii++ )
         {
-            wxString   name;
+            wxFileName fn = wxFileName( wxEmptyString, g_LibraryNames[ii], FootprintLibFileExtension );
 
-            fileReader.Rewind();
+            wxString libPath = wxGetApp().FindLibraryPath( fn );
 
-            while( reader.ReadLine() )
+            if( !libPath )
             {
-                char* line = reader.Line();
-
-                StrPurge( line + 8 );
-
-                if( strnicmp( line, "$MODULE", 7 ) != 0 )
-                    continue;
-
-                // Read module name.
-                name = FROM_UTF8( line + 8 );
-
-                if( name.CmpNoCase( aModuleName ) == 0 )
+                if( aDisplayError && !showed_error )
                 {
-                    newModule = new MODULE( GetBoard() );
+                    wxString msg = wxString::Format(
+                        _( "PCB footprint library file <%s> not found in search paths." ),
+                        fn.GetFullName().GetData() );
 
-                    // Temporarily switch the locale to standard C (needed to print
-                    // floating point numbers like 1.3)
-                    LOCALE_IO   toggle;
-
-                    newModule->ReadDescr( &reader );
-
-                    GetBoard()->Add( newModule, ADD_APPEND );
-                    SetStatusText( wxEmptyString );
-                    return newModule;
+                    DisplayError( this, msg );
+                    showed_error = true;
                 }
+                continue;
+            }
+
+            footprint = pi->FootprintLoad( libPath, aFootprintName );
+
+            if( footprint )
+            {
+                GetBoard()->Add( footprint, ADD_APPEND );
+                SetStatusText( wxEmptyString );
+                return footprint;
             }
         }
 
-        if( one_lib )
-            break;
-    }
+        if( !footprint )
+        {
+            if( aDisplayError )
+            {
+                wxString msg = wxString::Format(
+                    _( "Footprint '%s' not found in any library" ),
+                    aFootprintName.GetData() );
 
-    if( aDisplayMessageError )
+                DisplayError( NULL, msg );
+            }
+
+            return NULL;
+        }
+    }
+    catch( IO_ERROR ioe )
     {
-        msg.Printf( _( "Module <%s> not found" ), GetChars( aModuleName ) );
-        DisplayError( NULL, msg );
+        DisplayError( this, ioe.errorText );
     }
-
     return NULL;
 }