Component library editor improvements and minor bug fixes.

* Component library objects renamed for improved readability.
* Fields now move when selected in library editor.
* Add copy constructor to all library draw and library component objects.
* Added copy constructor to EDA_BaseStruct.
* Delete base screen in WinEDA_DrawFrame destructor to prevent potential memory leak.
* Fixed memory access bug when replacing and adding a component to library.
* Moved library component block manipulation code into component object.
* Removed all of the global variables used by the library editor main window object.
* The usual code cleaning and refactoring.

common/base_struct.cpp

@@ -41,6 +41,18 @@ EDA_BaseStruct::EDA_BaseStruct( KICAD_T idType )
 }
 
 
+EDA_BaseStruct::EDA_BaseStruct( const EDA_BaseStruct& base )
+{
+    m_StructType = base.m_StructType;
+    m_Parent     = base.m_Parent;
+    m_Son        = base.m_Son;
+    m_Flags      = base.m_Flags;
+    m_TimeStamp  = base.m_TimeStamp;
+    m_Status     = base.m_Status;
+    m_Selected   = base.m_Selected;
+}
+
+
 /********************************************/
 void EDA_BaseStruct::InitVars()
 /********************************************/

common/drawframe.cpp

@@ -108,10 +108,10 @@ WinEDA_DrawFrame::WinEDA_DrawFrame( wxWindow* father, int idtype,
 }
 
 
-/****************************************/
 WinEDA_DrawFrame::~WinEDA_DrawFrame()
-/****************************************/
 {
+    if( m_CurrentScreen != NULL )
+        delete m_CurrentScreen;
 }
 
 

eeschema/CMakeLists.txt

@@ -101,7 +101,6 @@ set(EESCHEMA_SRCS
     plotps.cpp
     plotdxf.cpp
     read_from_file_schematic_items_descriptions.cpp
-    savelib.cpp
     save_schemas.cpp
     schedit.cpp
     schematic_undo_redo.cpp

eeschema/annotate.cpp

@@ -10,8 +10,9 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "wxstruct.h"
+
 #include "program.h"
-#include "libcmp.h"
+#include "class_library.h"
 #include "protos.h"
 #include "netlist.h"
 

eeschema/backanno.cpp

@@ -9,10 +9,10 @@
 #include "confirm.h"
 #include "kicad_string.h"
 #include "gestfich.h"
-#include "libcmp.h"
-#include "general.h"
 #include "appl_wxstruct.h"
 
+#include "general.h"
+
 /* Variables Locales */
 
 /*******************************************************************************************/

eeschema/block.cpp

@@ -12,26 +12,31 @@
 #include "block_commande.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "class_marker_sch.h"
+#include "class_library.h"
 #include "protos.h"
 
 
 /* Variables Locales */
 
 // Imported functions:
-void               MoveItemsInList( PICKED_ITEMS_LIST& aItemsList, const wxPoint aMoveVector );
-void               MirrorListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& Center );
-void               DeleteItemsInList( WinEDA_DrawPanel*  panel, PICKED_ITEMS_LIST& aItemsList );
-void               DuplicateItemsInList( SCH_SCREEN* screen, PICKED_ITEMS_LIST& aItemsList, const wxPoint aMoveVector  );
+void               MoveItemsInList( PICKED_ITEMS_LIST& aItemsList,
+                                    const wxPoint      aMoveVector );
+void               MirrorListOfItems( PICKED_ITEMS_LIST& aItemsList,
+                                      wxPoint&           Center );
+void               DeleteItemsInList( WinEDA_DrawPanel*  panel,
+                                      PICKED_ITEMS_LIST& aItemsList );
+void               DuplicateItemsInList( SCH_SCREEN*        screen,
+                                         PICKED_ITEMS_LIST& aItemsList,
+                                         const wxPoint      aMoveVector  );
 
 /* Fonctions exportees */
 
 /* Fonctions Locales */
 static void           CollectStructsToDrag( SCH_SCREEN* screen );
 static void           AddPickedItem( SCH_SCREEN* screen, wxPoint aPosition );
-static LibEDA_BaseStruct* GetNextPinPosition( SCH_COMPONENT* aDrawLibItem,
+static LIB_DRAW_ITEM* GetNextPinPosition( SCH_COMPONENT* aDrawLibItem,
                                           wxPoint&       aPosition );
 static void           DrawMovingBlockOutlines( WinEDA_DrawPanel* panel,
                                                wxDC*             DC,
@@ -645,7 +650,7 @@ static void CollectStructsToDrag( SCH_SCREEN* screen )
         if( Struct->Type() == TYPE_SCH_COMPONENT )
         {
             // Add all pins of the selected component to list
-            LibEDA_BaseStruct* DrawItem;
+            LIB_DRAW_ITEM* DrawItem;
             wxPoint            pos;
             DrawItem = GetNextPinPosition( (SCH_COMPONENT*) Struct, pos );
             while( DrawItem )
@@ -840,7 +845,7 @@ static void AddPickedItem( SCH_SCREEN* screen, wxPoint position )
 
 
 /*********************************************************************************/
-static LibEDA_BaseStruct* GetNextPinPosition( SCH_COMPONENT* aDrawLibItem,
+static LIB_DRAW_ITEM* GetNextPinPosition( SCH_COMPONENT* aDrawLibItem,
                                           wxPoint&       aPosition )
 /*********************************************************************************/
 
@@ -856,9 +861,9 @@ static LibEDA_BaseStruct* GetNextPinPosition( SCH_COMPONENT* aDrawLibItem,
  */
 {
     LIB_COMPONENT* Entry;
-    static LibEDA_BaseStruct* NextItem;
+    static LIB_DRAW_ITEM* NextItem;
     static int Multi, convert, TransMat[2][2];
-    LibEDA_BaseStruct* DEntry;
+    LIB_DRAW_ITEM* DEntry;
     int orient;
     LibDrawPin* Pin;
     static wxPoint CmpPosition;

eeschema/build_BOM.cpp

@@ -14,17 +14,16 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "appl_wxstruct.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
+#include "class_library.h"
 #include "netlist.h"
+#include "protos.h"
 
 #include "dialog_build_BOM.h"
 
 
-#include "protos.h"
-
-
 /* object used in build BOM to handle the list of labels in schematic
  * because in a complex hierarchy, a label is used more than once,
  * and had more than one sheet path, so we must create a flat list of labels

eeschema/bus-wire-junction.cpp

@@ -9,7 +9,7 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
+#include "classes_body_items.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/busentry.cpp

@@ -10,7 +10,6 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/class_BodyItem_Text.cpp

@@ -15,7 +15,7 @@
 #include "trigo.h"
 
 #include "program.h"
-#include "libcmp.h"
+#include "classes_body_items.h"
 #include "general.h"
 #include "protos.h"
 
@@ -23,7 +23,7 @@
 
 
 LibDrawText::LibDrawText(LIB_COMPONENT * aParent) :
-    LibEDA_BaseStruct( COMPONENT_GRAPHIC_TEXT_DRAW_TYPE, aParent ),
+    LIB_DRAW_ITEM( COMPONENT_GRAPHIC_TEXT_DRAW_TYPE, aParent ),
     EDA_TextStruct()
 {
     m_Size     = wxSize( 50, 50 );
@@ -172,7 +172,7 @@ bool LibDrawText::HitTest( wxPoint aPosRef, int aThreshold,
 }
 
 
-LibEDA_BaseStruct* LibDrawText::DoGenCopy()
+LIB_DRAW_ITEM* LibDrawText::DoGenCopy()
 {
     LibDrawText* newitem = new LibDrawText(NULL);
 
@@ -189,11 +189,11 @@ LibEDA_BaseStruct* LibDrawText::DoGenCopy()
     newitem->m_Bold      = m_Bold;
     newitem->m_HJustify  = m_HJustify;
     newitem->m_VJustify  = m_VJustify;
-    return (LibEDA_BaseStruct*) newitem;
+    return (LIB_DRAW_ITEM*) newitem;
 }
 
 
-bool LibDrawText::DoCompare( const LibEDA_BaseStruct& other ) const
+bool LibDrawText::DoCompare( const LIB_DRAW_ITEM& other ) const
 {
     wxASSERT( other.Type() == COMPONENT_GRAPHIC_TEXT_DRAW_TYPE );
 
@@ -220,6 +220,12 @@ bool LibDrawText::DoTestInside( EDA_Rect& rect )
 }
 
 
+void LibDrawText::DoMove( const wxPoint& newPosition )
+{
+    m_Pos = newPosition;
+}
+
+
 /** Function GetPenSize
  * @return the size of the "pen" that be used to draw or plot this item
  */
@@ -273,7 +279,7 @@ void LibDrawText::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     wxString msg;
 
-    LibEDA_BaseStruct::DisplayInfo( frame );
+    LIB_DRAW_ITEM::DisplayInfo( frame );
 
     msg = ReturnStringFromValue( g_UnitMetric, m_Width,
                                  EESCHEMA_INTERNAL_UNIT, true );

eeschema/class_drawsheet.cpp

@@ -19,7 +19,6 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/class_drawsheetpath.cpp

@@ -11,7 +11,6 @@
 
 #include "common.h"
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 
 

eeschema/class_hierarchical_PIN_sheet.cpp

@@ -18,7 +18,6 @@
 #include "drawtxt.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/class_libentry.h

@@ -53,6 +53,8 @@ public:
 public:
     CMP_LIB_ENTRY( LibrEntryType CmpType, const wxString& name,
                    CMP_LIBRARY* lib = NULL );
+    CMP_LIB_ENTRY( const CMP_LIB_ENTRY& entry, CMP_LIBRARY* lib = NULL );
+
     virtual ~CMP_LIB_ENTRY();
 
     virtual wxString GetClass() const
@@ -123,7 +125,7 @@ public:
     bool               m_DrawPinNum;
     bool               m_DrawPinName;
     DLIST<LibDrawField> m_Fields;         /* Auxiliary Field list (id >= 2 ) */
-    LibEDA_BaseStruct* m_Drawings;        /* How to draw this part */
+    LIB_DRAW_ITEM    * m_Drawings;        /* How to draw this part */
     long               m_LastDate;        // Last change Date
 
 public:
@@ -134,6 +136,8 @@ public:
 
 
     LIB_COMPONENT( const wxString& name, CMP_LIBRARY* lib = NULL );
+    LIB_COMPONENT( const LIB_COMPONENT& component, CMP_LIBRARY* lib = NULL );
+
     ~LIB_COMPONENT();
 
     EDA_Rect GetBoundaryBox( int Unit, int Convert );
@@ -207,7 +211,7 @@ public:
      * @param panel - Panel to remove part from.
      * @param dc - Device context to remove part from.
      */
-    void RemoveDrawItem( LibEDA_BaseStruct* item,
+    void RemoveDrawItem( LIB_DRAW_ITEM* item,
                          WinEDA_DrawPanel* panel = NULL,
                          wxDC* dc = NULL );
 
@@ -244,6 +248,52 @@ public:
         wxASSERT( name != NULL );
         return m_AliasList.Index( name ) != wxNOT_FOUND;
     }
+
+    /**
+     * Checks all draw objects of component to see if they are with block.
+     *
+     * Use this method to mark draw objects as selected during block
+     * functions.
+     *
+     * @param rect - The bounding rectangle to test in draw items are inside.
+     * @param unit - The current unit number to test against.
+     * @param convert - Are the draw items being selected a conversion.
+     * @param editPinByPin - Used to ignore pin selections when in edit pin
+     *                       by pin mode is enabled.
+     *
+     * @return int - The number of draw object found inside the block select
+     *               rectangle.
+     */
+    int SelectItems( EDA_Rect& rect, int unit, int convert,
+                     bool editPinByPin );
+
+    /**
+     * Clears all the draw items marked by a block select.
+     */
+    void ClearSelectedItems( void );
+
+    /**
+     * Deletes the select draw items marked by a block select.
+     *
+     * The name and reference field will not be deleted.  They are the
+     * minimum drawing items required for any component.  Thier properties
+     * can be changed but the cannot be removed.
+     */
+    void DeleteSelectedItems( void );
+
+    /**
+     * Move the selected draw items marked by a block select.
+     */
+    void MoveSelectedItems( const wxPoint& offset );
+
+    /**
+     * Make a copy of the selected draw items marked by a block select.
+     *
+     * Fields are not copied.  Only component body items are copied.
+     * Copying fields would result in duplicate fields which does not
+     * make sense in this context.
+     */
+    void CopySelectedItems( const wxPoint& offset );
 };
 
 
@@ -265,6 +315,7 @@ protected:
 public:
     LIB_ALIAS( const wxString& name, LIB_COMPONENT* root,
                CMP_LIBRARY* lib = NULL );
+    LIB_ALIAS( const LIB_ALIAS& alias, CMP_LIBRARY* lib = NULL );
     ~LIB_ALIAS();
 
     virtual wxString GetClass() const

eeschema/class_libentry_fields.cpp

@@ -10,10 +10,9 @@
 #include "kicad_string.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
+#include "class_libentry.h"
 
 #include <wx/tokenzr.h>
 #include <wx/stream.h>
@@ -39,19 +38,35 @@
  *  others = free fields
  */
 LibDrawField::LibDrawField(LIB_COMPONENT * aParent, int idfield ) :
-    LibEDA_BaseStruct( COMPONENT_FIELD_DRAW_TYPE, aParent )
+    LIB_DRAW_ITEM( COMPONENT_FIELD_DRAW_TYPE, aParent )
 {
     m_FieldId = idfield;
     m_Size.x = m_Size.y = DEFAULT_SIZE_TEXT;
 }
 
 LibDrawField::LibDrawField( int idfield ) :
-    LibEDA_BaseStruct( COMPONENT_FIELD_DRAW_TYPE, NULL )
+    LIB_DRAW_ITEM( COMPONENT_FIELD_DRAW_TYPE, NULL )
 {
     m_FieldId = idfield;
     m_Size.x = m_Size.y = DEFAULT_SIZE_TEXT;
 }
 
+LibDrawField::LibDrawField( const LibDrawField& field ) :
+    LIB_DRAW_ITEM( field )
+{
+    m_Pos       = field.m_Pos;
+    m_Size      = field.m_Size;
+    m_Width     = field.m_Width;
+    m_Orient    = field.m_Orient;
+    m_Attributs = field.m_Attributs;
+    m_Text      = field.m_Text;
+    m_Name      = field.m_Name;
+    m_HJustify  = field.m_HJustify;
+    m_VJustify  = field.m_VJustify;
+    m_Italic    = field.m_Italic;
+    m_Bold      = field.m_Bold;
+}
+
 
 LibDrawField::~LibDrawField()
 {
@@ -358,13 +373,13 @@ bool LibDrawField::HitTest( wxPoint aPosRef, int aThreshold,
 }
 
 // Creation et Duplication d'un field
-LibEDA_BaseStruct* LibDrawField::DoGenCopy()
+LIB_DRAW_ITEM* LibDrawField::DoGenCopy()
 {
     LibDrawField* newfield = new LibDrawField( m_FieldId );
 
     Copy( newfield );
 
-    return (LibEDA_BaseStruct*) newfield;
+    return (LIB_DRAW_ITEM*) newfield;
 }
 
 
@@ -389,7 +404,7 @@ void LibDrawField::Copy( LibDrawField* Target ) const
 }
 
 
-bool LibDrawField::DoCompare( const LibEDA_BaseStruct& other ) const
+bool LibDrawField::DoCompare( const LIB_DRAW_ITEM& other ) const
 {
     wxASSERT( other.Type() == COMPONENT_FIELD_DRAW_TYPE );
 
@@ -416,13 +431,19 @@ bool LibDrawField::DoTestInside( EDA_Rect& rect )
 }
 
 
+void LibDrawField::DoMove( const wxPoint& newPosition )
+{
+    m_Pos = newPosition;
+}
+
+
 /*
  * If the field is the reference, return reference like schematic,
  * i.e U -> U? or U?A or the field text for others
  *
  * @fixme This should be handled by the field object.
  */
-wxString LibDrawField::GetFullText( void )
+wxString LibDrawField::GetFullText( int unit )
 {
     if( m_FieldId != REFERENCE )
         return m_Text;
@@ -433,11 +454,11 @@ wxString LibDrawField::GetFullText( void )
     {
 #if defined(KICAD_GOST)
         text.Printf( wxT( "%s?.%c" ),
-                     m_Text.GetData(), CurrentUnit + '1' - 1 );
+                     m_Text.GetData(), unit + '1' - 1 );
 #else
 
         text.Printf( wxT( "%s?%c" ),
-                     m_Text.GetData(), CurrentUnit + 'A' - 1 );
+                     m_Text.GetData(), unit + 'A' - 1 );
 #endif
     }
     else

eeschema/class_libentry_fields.h

@@ -6,6 +6,9 @@
 #define CLASS_LIBENTRY_FIELDS_H
 
 
+#include "classes_body_items.h"
+
+
 /* Fields , same as component fields.
  * can be defined in libraries (mandatory for ref and value, ca be useful for
  * footprints)
@@ -15,7 +18,7 @@
  * default value in schematic
  */
 
-class LibDrawField : public LibEDA_BaseStruct,
+class LibDrawField : public LIB_DRAW_ITEM,
     public EDA_TextStruct
 {
 public:
@@ -36,6 +39,7 @@ public:
 
     LibDrawField( int idfield = 2 );
     LibDrawField( LIB_COMPONENT * aParent, int idfield = 2 );
+    LibDrawField( const LibDrawField& field );
     ~LibDrawField();
     virtual wxString GetClass() const
     {
@@ -103,13 +107,26 @@ public:
         m_Parent = field.m_Parent;
     }
 
-    wxString GetFullText( void );
+    /**
+     * Return the text of a field.
+     *
+     * If the field is the reference field, the unit number is used to
+     * create a pseudo reference text.  If the base reference field is U,
+     * the string U?A will be returned for unit = 1.
+     *
+     * @param unit - The package unit number.  Only effects reference field.
+     *
+     * @return wxString - Field text.
+     */
+    wxString GetFullText( int unit = 1 );
 
 protected:
-    virtual LibEDA_BaseStruct* DoGenCopy();
-    virtual bool DoCompare( const LibEDA_BaseStruct& other ) const;
+    virtual LIB_DRAW_ITEM* DoGenCopy();
+    virtual bool DoCompare( const LIB_DRAW_ITEM& other ) const;
     virtual void DoOffset( const wxPoint& offset );
     virtual bool DoTestInside( EDA_Rect& rect );
+    virtual void DoMove( const wxPoint& newPosition );
+    virtual wxPoint DoGetPosition( void ) { return m_Pos; }
 };
 
 #endif  //  CLASS_LIBENTRY_FIELDS_H

eeschema/class_library.cpp

@@ -11,7 +11,6 @@
 #include "eda_doc.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "class_library.h"
@@ -197,7 +196,7 @@ LIB_COMPONENT* CMP_LIBRARY::AddComponent( LIB_COMPONENT* cmp )
 {
     wxASSERT( cmp != NULL );
 
-    LIB_COMPONENT* newCmp = CopyLibEntryStruct( cmp );
+    LIB_COMPONENT* newCmp = new LIB_COMPONENT( *cmp, this );
 
     if( newCmp == NULL )
         return NULL;
@@ -387,7 +386,7 @@ in library <%s>." ),
 
     RemoveEntry( oldComponent->GetName() );
 
-    LIB_COMPONENT* newCmp = CopyLibEntryStruct( newComponent );
+    LIB_COMPONENT* newCmp = new LIB_COMPONENT( *newComponent, this );
 
     if( newCmp == NULL )
         return NULL;
@@ -706,13 +705,12 @@ document file." ),
 }
 
 
-bool CMP_LIBRARY::Save( const wxString& FullFileName )
+bool CMP_LIBRARY::Save( const wxString& FullFileName, bool oldDocFormat )
 {
-    FILE* libfile, *docfile;
+    FILE* libfile;
     wxString msg;
     wxFileName libFileName = FullFileName;
     wxFileName backupFileName = FullFileName;
-    wxFileName docFileName = FullFileName;
 
     /* the old .lib file is renamed .bak */
     if( libFileName.FileExists() )
@@ -723,15 +721,69 @@ bool CMP_LIBRARY::Save( const wxString& FullFileName )
         if( !wxRenameFile( libFileName.GetFullPath(),
                            backupFileName.GetFullPath() ) )
         {
-            msg = wxT( "Failed to rename old lib file " ) +
+            libFileName.MakeAbsolute();
+            msg = wxT( "Failed to rename old component library file " ) +
                 backupFileName.GetFullPath();
             DisplayError( NULL, msg );
         }
     }
 
+    libfile = wxFopen( libFileName.GetFullPath(), wxT( "wt" ) );
+
+    if( libfile == NULL )
+    {
+        libFileName.MakeAbsolute();
+        msg = wxT( "Failed to create component library file " ) +
+            libFileName.GetFullPath();
+        DisplayError( NULL, msg );
+        return false;
+    }
+
+    m_IsModified = false;
+
+    /* Creation de l'entete de la librairie */
+    m_TimeStamp = GetTimeStamp();
+    if( !SaveHeader( libfile ) )
+    {
+        fclose( libfile );
+        return false;
+    }
+
+    bool success = true;
+
+    BOOST_FOREACH( CMP_LIB_ENTRY& entry, m_Entries )
+    {
+        if ( entry.Type == ROOT )
+        {
+            LIB_COMPONENT* component = ( LIB_COMPONENT* ) &entry;
+            if ( !component->Save( libfile ) )
+                success = false;
+        }
+    }
+
+    if( fprintf( libfile, "#\n#End Library\n" ) < 0 )
+        success = false;
+
+    fclose( libfile );
+
+    if( USE_OLD_DOC_FILE_FORMAT( m_verMajor, m_verMinor ) && oldDocFormat )
+        success = SaveDocFile( FullFileName );
+
+    return success;
+}
+
+
+bool CMP_LIBRARY::SaveDocFile( const wxString& FullFileName )
+{
+    FILE* docfile;
+    wxString msg;
+    wxFileName backupFileName = FullFileName;
+    wxFileName docFileName = FullFileName;
+
     docFileName.SetExt( DOC_EXT );
-    /* L'ancien fichier doc lib est renomme en .bck */
-    if( wxFileExists( docFileName.GetFullPath() ) )
+
+    /* Save current doc file as .bck */
+    if( docFileName.FileExists() )
     {
         backupFileName = docFileName;
         backupFileName.SetExt( wxT( "bck" ) );
@@ -740,64 +792,44 @@ bool CMP_LIBRARY::Save( const wxString& FullFileName )
         if( !wxRenameFile( docFileName.GetFullPath(),
                            backupFileName.GetFullPath() ) )
         {
-            msg = wxT( "Failed to save old doc lib file " ) +
+            msg = wxT( "Failed to save old library document file " ) +
                 backupFileName.GetFullPath();
             DisplayError( NULL, msg );
         }
     }
 
-    libfile = wxFopen( libFileName.GetFullPath(), wxT( "wt" ) );
-
-    if( libfile == NULL )
-    {
-        msg = wxT( "Failed to create component library file " ) +
-            libFileName.GetFullPath();
-        DisplayError( NULL, msg );
-        return false;
-    }
-
     docfile = wxFopen( docFileName.GetFullPath(), wxT( "wt" ) );
 
     if( docfile == NULL )
     {
+        docFileName.MakeAbsolute();
         msg = wxT( "Failed to create component document library file " ) +
             docFileName.GetFullPath();
         DisplayError( NULL, msg );
+        return false;
     }
 
-    m_IsModified = false;
-
-    /* Creation de l'entete de la librairie */
-    m_TimeStamp = GetTimeStamp();
-    SaveHeader( libfile );
-
-    /* Sauvegarde des composant: */
     char Line[256];
-    fprintf( docfile, "%s  Date: %s\n", DOCFILE_IDENT,
-             DateAndTime( Line ) );
+    if( fprintf( docfile, "%s  Date: %s\n", DOCFILE_IDENT,
+                 DateAndTime( Line ) ) < 0 )
+    {
+        fclose( docfile );
+        return false;
+    }
 
     bool success = true;
 
     BOOST_FOREACH( CMP_LIB_ENTRY& entry, m_Entries )
     {
-        if ( entry.Type == ROOT )
-        {
-            LIB_COMPONENT* component = ( LIB_COMPONENT* ) &entry;
-            if ( ! component->Save( libfile ) )
+        if ( !entry.SaveDoc( docfile ) )
             success = false;
     }
-        if ( docfile )
-        {
-            if ( ! entry.SaveDoc( docfile ) )
+
+    if ( fprintf( docfile, "#\n#End Doc Library\n" ) < 0 )
         success = false;
-        }
-    }
 
-    fprintf( libfile, "#\n#End Library\n" );
-    if ( docfile )
-        fprintf( docfile, "#\n#End Doc Library\n" );
-    fclose( libfile );
     fclose( docfile );
+
     return success;
 }
 
@@ -805,7 +837,7 @@ bool CMP_LIBRARY::Save( const wxString& FullFileName )
 bool CMP_LIBRARY::SaveHeader( FILE* file )
 {
     char BufLine[1024];
-    bool succes = false;
+    bool succes = true;
 
     DateAndTime( BufLine );
     if( fprintf( file, "%s %d.%d  Date: %s\n", LIBFILE_IDENT,
@@ -844,6 +876,7 @@ CMP_LIBRARY* CMP_LIBRARY::LoadLibrary( const wxFileName& fileName,
         return NULL;
     }
 
+    if( USE_OLD_DOC_FILE_FORMAT( lib->m_verMajor, lib->m_verMinor ) )
         lib->LoadDocs( errMsg );
 
     return lib;

eeschema/class_library.h

-/***********************************/
-/*	Headers for library definition */
-/***********************************/
+/*********************************************/
+/*	Headers for component library definition */
+/*********************************************/
 
 #ifndef CLASS_LIBRARY_H
 #define CLASS_LIBRARY_H
@@ -8,6 +8,37 @@
 
 #include "class_libentry.h"
 
+/*
+ * Component Library version and file header  macros.
+ */
+#define LIB_VERSION_MAJOR 2
+#define LIB_VERSION_MINOR 3
+
+/* Must be the first line of component library (.lib) files. */
+#define LIBFILE_IDENT     "EESchema-LIBRARY Version"
+
+#define LIB_VERSION( major, minor ) ( major * 100 + minor )
+
+#define IS_LIB_CURRENT_VERSION( major, minor )              \
+    (                                                       \
+        LIB_VERSION( major1, minor1 ) ==                    \
+        LIB_VERSION( LIB_VERSION_MAJOR, LIB_VERSION_MINOR)  \
+    )
+
+/*
+ * Library versions 2.3 and lower use the old separate library (.lib) and
+ * document (.dcm) files.  Component libraries after 2.3 merged the library
+ * and document files into a single library file.  This macro checks if the
+ * library version supports the old format
+ */
+#define USE_OLD_DOC_FILE_FORMAT( major, minor )                 \
+    ( LIB_VERSION( major, minor ) <= LIB_VERSION( 2, 3 ) )
+
+/* Must be the first line of component library document (.dcm) files. */
+#define DOCFILE_IDENT     "EESchema-DOCLIB  Version 2.0"
+
+#define DOC_EXT           wxT( "dcm" )
+
 
 /* Helpers for creating a list of component libraries. */
 class CMP_LIBRARY;
@@ -43,17 +74,35 @@ public:
     /**
      * Save library to file.
      *
-     * Two files are created.  The component objects are save as component
-     * library (*.lib) files.  The alias objects are save as document
-     * definition (*.dcm) files.  If the component library already exists,
-     * it is backup up in file *.bak.  If the document definition file
-     * already exists, it is backed up in file *.bck.
+     * Prior to component library version 3.0, two files were created.  The
+     * component objects are wer as component library (*.lib) files.  The
+     * library entry ojbect document strings were save in library document
+     * definition (*.dcm) files.  After version component library version 3.0,
+     * the document string information is saved as part of the library file.
+     * Saving separate document is maintained for backwards compatability.
+     * Please note that this behavior may change in the future.  If the
+     * component library already exists, it is backup up in file *.bak.
+     *
+     * @param aFullFileName - The library filename with path.
+     * @param oldDocFormat - Save the document information in a separate
+     *                       file if true.  The default is to save as the
+     *                       current library file format.
+     *
+     * @return bool - true if success writing else false.
+     */
+    bool Save( const wxString& aFullFileName, bool oldDocFormat = false );
+
+    /**
+     * Save library document information to file.
+     *
+     * If the document definition file* already exists, it is backed up in
+     * file *.bck.
      *
      * @param aFullFileName - The library filename with path.
      *
      * @return bool - true if success writing else false.
      */
-    bool Save( const wxString& aFullFileName );
+    bool SaveDocFile( const wxString& FullFileName );
 
     /**
      * Load library from file.

eeschema/class_netlist_object.cpp

@@ -6,7 +6,6 @@
 #include "fctsys.h"
 #include "common.h"
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 
 #include "class_netlist_object.h"

eeschema/class_pin.cpp

@@ -12,10 +12,10 @@
 #include "plot_common.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
 
 
 const wxChar* MsgPinElectricType[] =
@@ -34,7 +34,7 @@ const wxChar* MsgPinElectricType[] =
 };
 
 LibDrawPin::LibDrawPin(LIB_COMPONENT * aParent) :
-    LibEDA_BaseStruct( COMPONENT_PIN_DRAW_TYPE, aParent )
+    LIB_DRAW_ITEM( COMPONENT_PIN_DRAW_TYPE, aParent )
 {
     m_PinLen      = 300;              /* default Pin len */
     m_Orient      = PIN_RIGHT;        /* Pin oprient: Up, Down, Left, Right */
@@ -53,6 +53,26 @@ LibDrawPin::LibDrawPin(LIB_COMPONENT * aParent) :
 }
 
 
+LibDrawPin::LibDrawPin( const LibDrawPin& pin ) : LIB_DRAW_ITEM( pin )
+{
+    m_Pos                = pin.m_Pos;
+    m_PinLen             = pin.m_PinLen;
+    m_Orient             = pin.m_Orient;
+    m_PinShape           = pin.m_PinShape;
+    m_PinType            = pin.m_PinType;
+    m_Attributs          = pin.m_Attributs;
+    m_PinNum             = pin.m_PinNum;
+    m_PinNumSize         = pin.m_PinNumSize;
+    m_PinNameSize        = pin.m_PinNameSize;
+    m_PinNumShapeOpt     = pin.m_PinNumShapeOpt;
+    m_PinNameShapeOpt    = pin.m_PinNameShapeOpt;
+    m_PinNumPositionOpt  = pin.m_PinNumPositionOpt;
+    m_PinNamePositionOpt = pin.m_PinNamePositionOpt;
+    m_Width              = pin.m_Width;
+    m_PinName            = pin.m_PinName;
+}
+
+
 /**
  * Function HitTest
  * tests if the given wxPoint is within the bounds of this object.
@@ -1035,7 +1055,7 @@ void LibDrawPin::SetPinNumFromString( wxString& buffer )
 
 
 /*************************************/
-LibEDA_BaseStruct* LibDrawPin::DoGenCopy()
+LIB_DRAW_ITEM* LibDrawPin::DoGenCopy()
 /*************************************/
 {
     LibDrawPin* newpin = new LibDrawPin( GetParent() );
@@ -1059,11 +1079,11 @@ LibEDA_BaseStruct* LibDrawPin::DoGenCopy()
     newpin->m_Width              = m_Width;
     newpin->m_PinName            = m_PinName;
 
-    return (LibEDA_BaseStruct*) newpin;
+    return (LIB_DRAW_ITEM*) newpin;
 }
 
 
-bool LibDrawPin::DoCompare( const LibEDA_BaseStruct& other ) const
+bool LibDrawPin::DoCompare( const LIB_DRAW_ITEM& other ) const
 {
     wxASSERT( other.Type() == COMPONENT_PIN_DRAW_TYPE );
 
@@ -1087,6 +1107,12 @@ bool LibDrawPin::DoTestInside( EDA_Rect& rect )
 }
 
 
+void LibDrawPin::DoMove( const wxPoint& newPosition )
+{
+    m_Pos = newPosition;
+}
+
+
 /** Function LibDrawPin::DisplayInfo
  * Displays info (pin num and name, orientation ...
  * on the Info window
@@ -1096,7 +1122,7 @@ void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame )
     wxString Text;
     int      ii;
 
-    LibEDA_BaseStruct::DisplayInfo( frame );
+    LIB_DRAW_ITEM::DisplayInfo( frame );
 
     /* Affichage du nom */
     frame->MsgPanel->Affiche_1_Parametre( 30, _( "PinName" ), m_PinName,

eeschema/class_sch_cmp_field.cpp

@@ -16,13 +16,12 @@
 #include "base_struct.h"
 #include "gr_basic.h"
 #include "drawtxt.h"
+#include "macros.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-#include "macros.h"
-
 #include "protos.h"
+#include "class_library.h"
 
 
 SCH_CMP_FIELD::SCH_CMP_FIELD( const wxPoint& aPos, int aFieldId,

eeschema/class_sch_component.cpp

@@ -6,12 +6,12 @@
 #include "class_drawpanel.h"
 #include "gr_basic.h"
 #include "common.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "macros.h"
-
 #include "protos.h"
+#include "class_library.h"
 
 #include <wx/tokenzr.h>
 

eeschema/class_sch_screen.cpp

@@ -4,8 +4,8 @@
 #include "common.h"
 #include "eeschema_id.h"
 #include "class_drawpanel.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/class_schematic_items.cpp

@@ -8,9 +8,7 @@
 
 #include "common.h"
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* used to calculate the pen size from default value

eeschema/class_text-label.cpp

@@ -11,7 +11,6 @@
 #include "drawtxt.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/cleanup.cpp

@@ -7,12 +7,12 @@
 #include "common.h"
 #include "trigo.h"
 #include "confirm.h"
+#include "macros.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-#include "netlist.h"
-#include "macros.h"
 #include "protos.h"
+#include "netlist.h"
 
 
 /* Routines locales */

eeschema/controle.cpp

@@ -10,14 +10,14 @@
 #include "eeschema_id.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
 #include "libviewfrm.h"
-
+#include "classes_body_items.h"
 #include "class_marker_sch.h"
 
+
 /**************************************************************************************/
 SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( bool IncludePin )
 /**************************************************************************************/

eeschema/cross-probing.cpp

@@ -5,15 +5,13 @@
 #include "fctsys.h"
 #include "appl_wxstruct.h"
 #include "common.h"
-#include "program.h"
-#include "libcmp.h"
-#include "general.h"
-
 #include "eda_dde.h"
 
+#include "program.h"
+#include "general.h"
 #include "eeschema_id.h"
-
 #include "protos.h"
+#include "classes_body_items.h"
 
 
 /***************************************************************/

eeschema/dangling_ends.cpp

@@ -5,12 +5,12 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-
 #include "netlist.h" /* Definitions generales liees au calcul de netliste */
 #include "protos.h"
+#include "class_library.h"
 
 
 enum End_Type {
@@ -392,7 +392,7 @@ DanglingEndHandle* RebuildEndList( EDA_BaseStruct* DrawList )
             if( Entry == NULL )
                 break;
 
-            LibEDA_BaseStruct* DrawLibItem = Entry->m_Drawings;
+            LIB_DRAW_ITEM* DrawLibItem = Entry->m_Drawings;
             for( ; DrawLibItem != NULL; DrawLibItem = DrawLibItem->Next() )
             {
                 if( DrawLibItem->Type() != COMPONENT_PIN_DRAW_TYPE )

eeschema/database.cpp

@@ -13,9 +13,9 @@
 #include "kicad_string.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
+#include "class_library.h"
 
 #include <boost/foreach.hpp>
 

eeschema/delete.cpp

@@ -7,7 +7,6 @@
 #include "common.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "class_marker_sch.h"

eeschema/delsheet.cpp

@@ -6,8 +6,8 @@
 #include "appl_wxstruct.h"
 #include "common.h"
 #include "confirm.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/dialog_build_BOM.cpp

@@ -9,10 +9,9 @@
 
 #include "fctsys.h"
 #include "appl_wxstruct.h"
-
 #include "common.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
 

eeschema/dialog_cmp_graphic_properties.cpp

@@ -51,7 +51,7 @@ WinEDA_bodygraphics_PropertiesFrame::WinEDA_bodygraphics_PropertiesFrame( )
 
 WinEDA_bodygraphics_PropertiesFrame::WinEDA_bodygraphics_PropertiesFrame( WinEDA_LibeditFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-LibEDA_BaseStruct * CurrentItem = CurrentDrawItem;
+    LIB_DRAW_ITEM * CurrentItem = parent->GetDrawItem();
 
 	m_Parent = parent;
     Create(parent, id, caption, pos, size, style);

eeschema/dialog_create_component.cpp

@@ -16,12 +16,12 @@
 #endif
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "confirm.h"
+
 #include "program.h"
-#include "libcmp.h"
-#include "general.h"
+#include "class_libentry.h"
+#include "libeditfrm.h"
 
 ////@begin includes
 ////@end includes
@@ -104,7 +104,9 @@ bool WinEDA_CreateCmpDialog::Create( WinEDA_DrawFrame* parent, wxWindowID id, co
 void WinEDA_CreateCmpDialog::SetComponentData( LIB_COMPONENT & component )
 /**********************************************************************************/
 {
-    g_AsDeMorgan = m_AsConvert->GetValue();
+    WinEDA_LibeditFrame* parent = (WinEDA_LibeditFrame*) GetParent();
+
+    parent->SetShowDeMorgan( m_AsConvert->GetValue() );
     component.m_UnitCount = m_PartsCount->GetSelection() + 1;
     component.m_Prefix.m_Text = m_Reference->GetValue();
 	if ( m_PinNameInside->GetValue() == FALSE)

eeschema/dialog_edit_component_in_lib.cpp

@@ -10,10 +10,10 @@
 #include "gestfich.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
 
 #include "dialog_edit_component_in_lib.h"
 
@@ -45,7 +45,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init( )
     SetFocus();
     m_AliasLocation = -1;
 
-    LIB_COMPONENT* component = m_Parent->GetCurrentComponent();
+    LIB_COMPONENT* component = m_Parent->GetComponent();
 
     if( component == NULL )
     {
@@ -55,22 +55,22 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init( )
 
     wxString title = _( "Properties for " );
 
-    if( !CurrentAliasName.IsEmpty() )
+    if( !m_Parent->GetAliasName().IsEmpty() )
     {
-        title += CurrentAliasName + _( " (alias of " ) +
+        title += m_Parent->GetAliasName() + _( " (alias of " ) +
             component->GetName() + wxT( ")" );
     }
     else
     {
         title += component->GetName();
-        CurrentAliasName.Empty();
+        m_Parent->GetAliasName().Empty();
     }
 
     SetTitle( title );
     InitPanelDoc();
     InitBasicPanel();
 
-    if( !CurrentAliasName.IsEmpty() )
+    if( !m_Parent->GetAliasName().IsEmpty() )
         m_ButtonDeleteAllAlias->Enable( false );
 
     /* Place list of alias names in listbox */

eeschema/dialog_edit_component_in_schematic.cpp

@@ -9,9 +9,9 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
+#include "class_library.h"
 
 #include "dialog_edit_component_in_schematic.h"
 

eeschema/dialog_edit_label.cpp

@@ -13,7 +13,6 @@
 #include "common.h"
 #include "class_drawpanel.h"
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "dialog_edit_label.h"
 

eeschema/dialog_edit_libentry_fields_in_lib.cpp

@@ -10,10 +10,10 @@
 #include "class_drawpanel.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_library.h"
 
 #include "dialog_edit_libentry_fields_in_lib_base.h"
 
@@ -101,12 +101,12 @@ private:
 
 void WinEDA_LibeditFrame::InstallFieldsEditorDialog( wxCommandEvent& event )
 {
-    if( m_currentComponent == NULL )
+    if( m_component == NULL )
         return;
 
     DrawPanel->UnManageCursor( 0, wxCURSOR_ARROW );
 
-    DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB dlg( this, m_currentComponent );
+    DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB dlg( this, m_component );
 
     int abort = dlg.ShowModal();
 

eeschema/dialog_eeschema_config.cpp

@@ -14,7 +14,6 @@
 #include "gestfich.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "netlist.h"

eeschema/dialog_erc.cpp

@@ -8,16 +8,14 @@
 // Licence:     GPL
 /////////////////////////////////////////////////////////////////////////////
 #include "fctsys.h"
-
 #include "common.h"
 #include "class_drawpanel.h"
+#include "bitmaps.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
-#include "bitmaps.h"
 #include "class_marker_sch.h"
-
 #include "protos.h"
 
 #include "dialog_erc.h"

eeschema/dialog_options.cpp

@@ -24,7 +24,6 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/edit_component_in_schematic.cpp

@@ -9,10 +9,9 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
+#include "class_library.h"
 
 
 /* Fonctions locales */

eeschema/edit_graphic_bodyitem_text.cpp

@@ -13,10 +13,10 @@
 #include "class_drawpanel.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
 
 #include "dialog_bodygraphictext_properties_base.h"
 
@@ -144,7 +144,7 @@ void Dialog_BodyGraphicText_Properties::OnOkClick( wxCommandEvent& event )
 /* Met a jour les differents parametres pour le composant en cours d'edition
 */
 {
-wxString Line;
+    wxString Line;
 
     Line = m_TextValue->GetValue();
     g_LastTextOrient = m_Orient->GetValue() ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ;
@@ -165,12 +165,12 @@ wxString Line;
         m_GraphicText->m_Orient = g_LastTextOrient;
 
         if( g_FlDrawSpecificUnit )
-            m_GraphicText->m_Unit = CurrentUnit;
+            m_GraphicText->m_Unit = m_Parent->GetUnit();
         else
             m_GraphicText->m_Unit = 0;
 
         if( g_FlDrawSpecificConvert )
-            m_GraphicText->m_Convert = CurrentConvert;
+            m_GraphicText->m_Convert = m_Parent->GetConvert();
         else
             m_GraphicText->m_Convert = 0;
 
@@ -216,14 +216,14 @@ wxString Line;
     }
     Close();
 
-    if ( CurrentDrawItem )
-        CurrentDrawItem->DisplayInfo( m_Parent );
+    if ( m_Parent->GetDrawItem() )
+        m_Parent->GetDrawItem()->DisplayInfo( m_Parent );
     Close();
 }
 
 
 
-void WinEDA_LibeditFrame::EditSymbolText(wxDC * DC, LibEDA_BaseStruct * DrawItem)
+void WinEDA_LibeditFrame::EditSymbolText(wxDC* DC, LIB_DRAW_ITEM* DrawItem)
 {
     int DrawMode = g_XorMode;
 
@@ -263,7 +263,7 @@ void WinEDA_LibeditFrame::RotateSymbolText(wxDC * DC)
     90 deg Graphic text Rotation .
 */
 {
-    LibDrawText * DrawItem = (LibDrawText *) CurrentDrawItem;
+    LibDrawText * DrawItem = (LibDrawText *) m_drawItem;
 
     if( DrawItem == NULL )
         return;

eeschema/edit_label.cpp

@@ -12,12 +12,11 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-#include "dialog_edit_label.h"
-
 #include "protos.h"
 
+#include "dialog_edit_label.h"
+
 /* Fonctions locales */
 static void ShowWhileMoving( WinEDA_DrawPanel* panel, wxDC* DC, bool erase );
 static void ExitMoveTexte( WinEDA_DrawPanel* panel, wxDC* DC );

eeschema/eeconfig.cpp

@@ -12,7 +12,6 @@
 #include "gestfich.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "eeconfig.h"

eeschema/eelayer.cpp

@@ -16,7 +16,6 @@
 #include "class_drawpanel.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 

eeschema/eelibs_draw_components.cpp

@@ -6,8 +6,8 @@
 #include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "class_library.h"

eeschema/eelibs_read_libraryfiles.cpp

@@ -7,8 +7,8 @@
 #include "appl_wxstruct.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
+#include "class_library.h"
 
 #include "dialog_load_error.h"
 

eeschema/eeredraw.cpp

@@ -10,9 +10,10 @@
 #include "appl_wxstruct.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
+#include "class_library.h"
+
 
 static EDA_BaseStruct* HighLightStruct = NULL;
 

eeschema/eeschema.cpp

@@ -8,12 +8,11 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "gestfich.h"
-#include "program.h"
-#include "general.h"
 #include "bitmaps.h"
 #include "eda_dde.h"
 
-#include "libcmp.h"
+#include "program.h"
+#include "general.h"
 #include "protos.h"
 
 #include <wx/snglinst.h>
@@ -65,7 +64,6 @@ HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr;
 
 //SCH_SCREEN * ScreenSch;
 DrawSheetStruct* g_RootSheet = NULL;
-SCH_SCREEN*      g_ScreenLib = NULL;
 
 wxString   g_NetCmpExtBuffer( wxT( "cmp" ) );
 
@@ -97,21 +95,6 @@ int g_ItemSelectetColor = BROWN;
 // Color to draw items flagged invisible, in libedit (they are insisible in eeschema
 int g_InvisibleItemColor = DARKGRAY;
 
-/* Variables used by LibEdit */
-LibEDA_BaseStruct* LibItemToRepeat = NULL; /* pointer on a graphic item than
-                                            * can be duplicated by the Ins key
-                                            * (usually the last created item */
-CMP_LIBRARY* CurrentLib = NULL;          /* Current opened library */
-LibEDA_BaseStruct* CurrentDrawItem = NULL;     /* current edited item */
-
-// Current selected alias (for components which have aliases)
-wxString CurrentAliasName;
-
-// True if the current component has a "De Morgan" representation
-bool g_AsDeMorgan;
-int CurrentUnit = 1;
-int CurrentConvert = 1;
-
 int DefaultTransformMatrix[2][2] = { { 1, 0 }, { 0, -1 } };
 
 

eeschema/erc.cpp

@@ -8,18 +8,17 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "appl_wxstruct.h"
+#include "bitmaps.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
-#include "bitmaps.h"
 #include "class_marker_sch.h"
+#include "protos.h"
+#include "erc.h"
 
 #include "dialog_erc.h"
-#include "erc.h"
 
-#include "protos.h"
 
 /* ERC tests :
  *  1 - conflicts between connected pins ( example: 2 connected outputs )

eeschema/files-io.cpp

@@ -7,12 +7,12 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "gestfich.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 #include "eeschema_id.h"
+#include "class_library.h"
 
 
 /****************************************************************/

eeschema/find.cpp

@@ -16,10 +16,10 @@
 #include "gestfich.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "class_marker_sch.h"
 #include "protos.h"
+#include "class_library.h"
 
 #include <boost/foreach.hpp>
 

eeschema/general.h

@@ -158,7 +158,7 @@ extern HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr;
 
 /* First and main (root) screen */
 extern DrawSheetStruct* g_RootSheet;
-extern SCH_SCREEN*      g_ScreenLib;
+
 
 /*************************************/
 /* Gestion de recherche des elements */

eeschema/getpart.cpp

@@ -9,14 +9,14 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 
-#include "get_component_dialog.h"
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "class_library.h"
 #include "libviewfrm.h"
 
+#include "get_component_dialog.h"
+
 #include <boost/foreach.hpp>
 
 
@@ -441,7 +441,7 @@ void WinEDA_SchematicFrame::ConvertPart( SCH_COMPONENT* DrawComponent,
 int LookForConvertPart( LIB_COMPONENT* LibEntry )
 {
     int ii;
-    LibEDA_BaseStruct* DrawLibEntry;
+    LIB_DRAW_ITEM* DrawLibEntry;
 
     DrawLibEntry = LibEntry->m_Drawings;
     ii = 0;

eeschema/hierarch.cpp

@@ -7,18 +7,15 @@
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
+#include "bitmaps.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"
 
 
-#include "bitmaps.h"
-
-
 static bool UpdateScreenFromSheet( WinEDA_SchematicFrame* frame );
 
 enum {

eeschema/hotkeys.cpp

@@ -8,10 +8,11 @@
 #include "hotkeys.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
+
 
 /* How to add a new hotkey:
  * add a new id in the enum hotkey_id_commnand like MY_NEW_ID_FUNCTION (see
@@ -463,7 +464,7 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
 
     wxPoint            MousePos = GetScreen()->m_MousePosition;
 
-    LibEDA_BaseStruct* DrawEntry = LocateItemUsingCursor();
+    LIB_DRAW_ITEM* DrawEntry = LocateItemUsingCursor();
 
     // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to
     // handle...)
@@ -533,10 +534,10 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
         break;
 
     case HK_REPEAT_LAST:
-        if( LibItemToRepeat && (LibItemToRepeat->m_Flags == 0)
-           && (LibItemToRepeat->Type() == COMPONENT_PIN_DRAW_TYPE) )
+        if( m_lastDrawItem && (m_lastDrawItem->m_Flags == 0)
+           && (m_lastDrawItem->Type() == COMPONENT_PIN_DRAW_TYPE) )
         {
-            RepeatPinItem( DC, (LibDrawPin*) LibItemToRepeat );
+            RepeatPinItem( DC, (LibDrawPin*) m_lastDrawItem );
         }
         else
             wxBell();
@@ -544,18 +545,18 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
 
     case HK_EDIT_PIN:
         if( DrawEntry )
-            CurrentDrawItem = DrawEntry;
-        if( CurrentDrawItem )
+            m_drawItem = DrawEntry;
+        if( m_drawItem )
         {
-            if( CurrentDrawItem->Type() == COMPONENT_PIN_DRAW_TYPE )
+            if( m_drawItem->Type() == COMPONENT_PIN_DRAW_TYPE )
                 InstallPineditFrame( this, DC, MousePos );
         }
         break;
 
     case HK_DELETE_PIN:
         if( DrawEntry )
-            CurrentDrawItem = DrawEntry;
-        if( CurrentDrawItem )
+            m_drawItem = DrawEntry;
+        if( m_drawItem )
         {
             wxCommandEvent evt;
             evt.SetId( ID_POPUP_LIBEDIT_DELETE_ITEM );
@@ -565,8 +566,8 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
 
     case HK_MOVE_PIN:
         if( DrawEntry )
-            CurrentDrawItem = DrawEntry;
-        if( CurrentDrawItem )
+            m_drawItem = DrawEntry;
+        if( m_drawItem )
         {
             wxCommandEvent evt;
             evt.SetId( ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST );

eeschema/lib_export.cpp

@@ -16,10 +16,10 @@
 #include "eeschema_id.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_library.h"
 
 #include <wx/filename.h>
 
@@ -41,7 +41,7 @@ void WinEDA_LibeditFrame::OnImportPart( wxCommandEvent& event )
     CMP_LIBRARY*   LibTmp;
     CMP_LIB_ENTRY* LibEntry;
 
-    LibItemToRepeat = NULL;
+    m_lastDrawItem = NULL;
 
     wxFileDialog dlg( this, _( "Import Component" ), m_LastLibImportPath,
                       wxEmptyString, CompLibFileWildcard,
@@ -96,13 +96,13 @@ void WinEDA_LibeditFrame::OnExportPart( wxCommandEvent& event )
     CMP_LIBRARY* CurLibTmp;
     bool         createLib = ( event.GetId() != ExportPartId ) ? false : true;
 
-    if( m_currentComponent == NULL )
+    if( m_component == NULL )
     {
         DisplayError( this, _( "There is no component selected to save." ) );
         return;
     }
 
-    fn = m_currentComponent->GetName().Lower();
+    fn = m_component->GetName().Lower();
     fn.SetExt( CompLibFileExtension );
 
     title = createLib ? _( "New Library" ) : _( "Export Component" );
@@ -115,19 +115,19 @@ void WinEDA_LibeditFrame::OnExportPart( wxCommandEvent& event )
 
     fn = dlg.GetPath();
 
-    CurLibTmp = CurrentLib;
+    CurLibTmp = m_library;
 
-    CurrentLib = new CMP_LIBRARY( LIBRARY_TYPE_EESCHEMA, fn );
+    m_library = new CMP_LIBRARY( LIBRARY_TYPE_EESCHEMA, fn );
 
     SaveOnePartInMemory();
 
-    bool success = CurrentLib->Save( fn.GetFullPath() );
+    bool success = m_library->Save( fn.GetFullPath() );
 
     if( success )
         m_LastLibExportPath = fn.GetPath();
 
-    delete CurrentLib;
-    CurrentLib = CurLibTmp;
+    delete m_library;
+    m_library = CurLibTmp;
 
     if( createLib && success )
     {

eeschema/libarch.cpp

@@ -7,10 +7,10 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
 #include "protos.h"
+#include "class_library.h"
 
 
 /*

eeschema/libcmp.h

@@ -6,35 +6,6 @@
 #define LIBCMP_H
 
 
-#define LIB_VERSION_MAJOR 2
-#define LIB_VERSION_MINOR 3
-
-/* Must be the first line of component library (.lib) files. */
-#define LIBFILE_IDENT     "EESchema-LIBRARY Version"
-
-#define LIB_VERSION( major, minor ) ( major * 100 + minor )
-
-#define IS_LIB_CURRENT_VERSION( major, minor )              \
-    (                                                       \
-        LIB_VERSION( major1, minor1 ) ==                    \
-        LIB_VERSION( LIB_VERSION_MAJOR, LIB_VERSION_MINOR)  \
-    )
-
-/*
- * Library versions 2.3 and lower use the old separate library (.lib) and
- * document (.dcm) files.  Component libraries after 2.3 merged the library
- * and document files into a single library file.  This macro checks if the
- * library version supports the old format
- */
-#define USE_OLD_DOC_FILE_FORMAT( major, minor )                 \
-    ( LIB_VERSION( major, minor ) < LIB_VERSION( 2, 3 )
-
-/* Must be the first line of component library document (.dcm) files. */
-#define DOCFILE_IDENT     "EESchema-DOCLIB  Version 2.0"
-
-#define DOC_EXT           wxT( "dcm" )
-
-
 enum LocateDrawStructType
 {
     LOCATE_COMPONENT_ARC_DRAW_TYPE          = 1,
@@ -49,19 +20,4 @@ enum LocateDrawStructType
 #define LOCATE_ALL_DRAW_ITEM 0xFFFFFFFF
 
 
-#include "class_library.h"
-
-
-/* Variables used by LibEdit */
-extern LibEDA_BaseStruct* LibItemToRepeat; /* pointer on a graphic item than
-                                            * can be duplicated by the Ins key
-                                            * (usually the last created item */
-extern CMP_LIBRARY*       CurrentLib;      /* Current opened library */
-extern LibEDA_BaseStruct* CurrentDrawItem; /* current edited item */
-
-extern wxString CurrentAliasName;
-extern bool     g_AsDeMorgan;
-extern int      CurrentUnit;
-extern int      CurrentConvert;
-
 #endif  //  LIBCMP_H

eeschema/libedit_onleftclick.cpp

@@ -13,24 +13,25 @@
 #include "eeschema_id.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
+#include "libcmp.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
 
 
 void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
 {
-    LibEDA_BaseStruct* DrawEntry = CurrentDrawItem;
+    LIB_DRAW_ITEM* DrawEntry = m_drawItem;
 
-    if( m_currentComponent == NULL )   // No component loaded !
+    if( m_component == NULL )   // No component loaded !
         return;
 
     if( m_ID_current_state == 0 )
     {
         if( DrawEntry && DrawEntry->m_Flags )
         {
-            SaveCopyInUndoList( m_currentComponent );
+            SaveCopyInUndoList( m_component );
 
             switch( DrawEntry->Type() )
             {
@@ -50,28 +51,24 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
         }
         else
         {
-            DrawEntry = LocatePin( GetScreen()->m_MousePosition,
-                                   m_currentComponent, CurrentUnit,
-                                   CurrentConvert );
+            DrawEntry = LocatePin( GetScreen()->m_MousePosition, m_component,
+                                   m_unit, m_convert );
             if( DrawEntry == NULL )
             {
                 DrawEntry = LocateDrawItem( (SCH_SCREEN*)GetScreen(),
                                             GetScreen()->m_MousePosition,
-                                            m_currentComponent, CurrentUnit,
-                                            CurrentConvert,
+                                            m_component, m_unit, m_convert,
                                             LOCATE_ALL_DRAW_ITEM );
             }
 
             if( DrawEntry == NULL )
-                DrawEntry = LocatePin( GetScreen()->m_Curseur,
-                                       m_currentComponent, CurrentUnit,
-                                       CurrentConvert );
+                DrawEntry = LocatePin( GetScreen()->m_Curseur, m_component,
+                                       m_unit, m_convert );
             if( DrawEntry == NULL )
             {
                 DrawEntry = LocateDrawItem( (SCH_SCREEN*)GetScreen(),
                                             GetScreen()->m_Curseur,
-                                            m_currentComponent, CurrentUnit,
-                                            CurrentConvert,
+                                            m_component, m_unit, m_convert,
                                             LOCATE_ALL_DRAW_ITEM );
             }
 
@@ -91,13 +88,13 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
             break;
 
         case ID_LIBEDIT_PIN_BUTT:
-            if( CurrentDrawItem == NULL || CurrentDrawItem->m_Flags == 0 )
+            if( m_drawItem == NULL || m_drawItem->m_Flags == 0 )
             {
                 CreatePin( DC );
             }
             else
             {
-                SaveCopyInUndoList( m_currentComponent );
+                SaveCopyInUndoList( m_component );
                 PlacePin( DC );
             }
             break;
@@ -107,60 +104,57 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
         case ID_LIBEDIT_BODY_CIRCLE_BUTT:
         case ID_LIBEDIT_BODY_RECT_BUTT:
         case ID_LIBEDIT_BODY_TEXT_BUTT:
-            if( CurrentDrawItem == NULL || CurrentDrawItem->m_Flags == 0 )
+            if( m_drawItem == NULL || m_drawItem->m_Flags == 0 )
             {
-                CurrentDrawItem = CreateGraphicItem( m_currentComponent, DC );
+                m_drawItem = CreateGraphicItem( m_component, DC );
             }
-            else if( CurrentDrawItem )
+            else if( m_drawItem )
             {
-                if( CurrentDrawItem->m_Flags & IS_NEW )
+                if( m_drawItem->m_Flags & IS_NEW )
                     GraphicItemBeginDraw( DC );
                 else
                 {
-                    SaveCopyInUndoList( m_currentComponent );
+                    SaveCopyInUndoList( m_component );
                     EndDrawGraphicItem( DC );
                 }
             }
             break;
 
         case ID_LIBEDIT_DELETE_ITEM_BUTT:
-            DrawEntry = LocatePin( GetScreen()->m_MousePosition,
-                                   m_currentComponent, CurrentUnit,
-                                   CurrentConvert );
+            DrawEntry = LocatePin( GetScreen()->m_MousePosition, m_component,
+                                   m_unit, m_convert );
             if( DrawEntry == NULL )
             {
                 DrawEntry = LocateDrawItem( (SCH_SCREEN*)GetScreen(),
                                             GetScreen()->m_MousePosition,
-                                            m_currentComponent, CurrentUnit,
-                                            CurrentConvert,
+                                            m_component, m_unit, m_convert,
                                             LOCATE_ALL_DRAW_ITEM );
             }
 
             if( DrawEntry == NULL )
                 DrawEntry = LocatePin( GetScreen()->m_Curseur,
-                                       m_currentComponent, CurrentUnit,
-                                       CurrentConvert );
+                                       m_component, m_unit,
+                                       m_convert );
             if( DrawEntry == NULL )
             {
                 DrawEntry = LocateDrawItem( (SCH_SCREEN*)GetScreen(),
                                             GetScreen()->m_Curseur,
-                                            m_currentComponent, CurrentUnit,
-                                            CurrentConvert,
+                                            m_component, m_unit, m_convert,
                                             LOCATE_ALL_DRAW_ITEM );
             }
             if( DrawEntry == NULL )
                 DisplayCmpDoc();
-            SaveCopyInUndoList( m_currentComponent );
+            SaveCopyInUndoList( m_component );
             if( DrawEntry->Type() == COMPONENT_PIN_DRAW_TYPE )
-                DeletePin( DC, m_currentComponent, (LibDrawPin*) DrawEntry );
+                DeletePin( DC, m_component, (LibDrawPin*) DrawEntry );
             else
-                m_currentComponent->RemoveDrawItem( DrawEntry, DrawPanel, DC );
+                m_component->RemoveDrawItem( DrawEntry, DrawPanel, DC );
             DrawEntry = NULL;
             GetScreen()->SetModify();
             break;
 
         case ID_LIBEDIT_ANCHOR_ITEM_BUTT:
-            SaveCopyInUndoList( m_currentComponent );
+            SaveCopyInUndoList( m_component );
             PlaceAncre();
             SetToolID( 0, wxCURSOR_ARROW, wxEmptyString );
             break;
@@ -184,38 +178,36 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
 void WinEDA_LibeditFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
 {
     wxPoint        pos = GetPosition();
-    LibEDA_BaseStruct* DrawEntry = CurrentDrawItem;
+    LIB_DRAW_ITEM* DrawEntry = m_drawItem;
 
-    if( m_currentComponent == NULL )
+    if( m_component == NULL )
         return;
 
     if( ( DrawEntry == NULL ) || ( DrawEntry->m_Flags == 0 ) )
     {   // We can locate an item
-        DrawEntry = LocatePin( GetScreen()->m_MousePosition, m_currentComponent,
-                               CurrentUnit, CurrentConvert );
+        DrawEntry = LocatePin( GetScreen()->m_MousePosition, m_component,
+                               m_unit, m_convert );
         if( DrawEntry == NULL )
-            DrawEntry = LocatePin( GetScreen()->m_Curseur, m_currentComponent,
-                                   CurrentUnit, CurrentConvert );
+            DrawEntry = LocatePin( GetScreen()->m_Curseur, m_component,
+                                   m_unit, m_convert );
         if( DrawEntry == NULL )
         {
-            DrawEntry = CurrentDrawItem =
+            DrawEntry = m_drawItem =
                 LocateDrawItem( (SCH_SCREEN*) GetScreen(),
-                                GetScreen()->m_MousePosition,
-                                m_currentComponent, CurrentUnit,
-                                CurrentConvert, LOCATE_ALL_DRAW_ITEM );
+                                GetScreen()->m_MousePosition, m_component,
+                                m_unit, m_convert, LOCATE_ALL_DRAW_ITEM );
         }
         if( DrawEntry == NULL )
         {
-            DrawEntry = CurrentDrawItem =
+            DrawEntry = m_drawItem =
                 LocateDrawItem( (SCH_SCREEN*) GetScreen(),
-                                GetScreen()->m_Curseur,
-                                m_currentComponent, CurrentUnit,
-                                CurrentConvert, LOCATE_ALL_DRAW_ITEM );
+                                GetScreen()->m_Curseur, m_component, m_unit,
+                                m_convert, LOCATE_ALL_DRAW_ITEM );
         }
         if( DrawEntry == NULL )
         {
-            DrawEntry = CurrentDrawItem =
-                (LibEDA_BaseStruct*) LocateField( m_currentComponent );
+            DrawEntry = m_drawItem =
+                (LIB_DRAW_ITEM*) LocateField( m_component );
         }
         if( DrawEntry == NULL )
         {
@@ -228,7 +220,7 @@ void WinEDA_LibeditFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
     else
         return;
 
-    CurrentDrawItem = DrawEntry;
+    m_drawItem = DrawEntry;
 
     DrawPanel->m_IgnoreMouseEvents = TRUE;
 

eeschema/libedit_onrightclick.cpp

@@ -14,10 +14,10 @@
 #include "hotkeys.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
 
 
 /* functions to add commands and submenus depending on the item */
@@ -29,10 +29,10 @@ static void AddMenusForPin( wxMenu* PopMenu, LibDrawPin* Pin,
 bool WinEDA_LibeditFrame::OnRightClick( const wxPoint& MousePos,
                                         wxMenu*        PopMenu )
 {
-    LibEDA_BaseStruct* DrawEntry = LocateItemUsingCursor();
+    LIB_DRAW_ITEM* DrawEntry = LocateItemUsingCursor();
     bool BlockActive = (GetScreen()->m_BlockLocate.m_Command != BLOCK_IDLE);
 
-    if( m_currentComponent == NULL )
+    if( m_component == NULL )
         return true;
 
     //  If Command in progresss: put the menu "cancel" and "end tool"
@@ -68,7 +68,7 @@ bool WinEDA_LibeditFrame::OnRightClick( const wxPoint& MousePos,
     else
         return true;
 
-    CurrentDrawItem = DrawEntry;
+    m_drawItem = DrawEntry;
     wxString msg;
 
     switch( DrawEntry->Type() )
@@ -211,7 +211,7 @@ bool WinEDA_LibeditFrame::OnRightClick( const wxPoint& MousePos,
 StructType %d" ),
             DrawEntry->Type() );
         DisplayError( this, msg );
-        CurrentDrawItem = NULL;
+        m_drawItem = NULL;
         break;
     }
 

eeschema/libedit_undo_redo.cpp

@@ -7,10 +7,10 @@
 
 #include "common.h"
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_libentry.h"
 
 
 /*************************************************************************/
@@ -22,7 +22,7 @@ void WinEDA_LibeditFrame::SaveCopyInUndoList( EDA_BaseStruct* ItemToCopy,
     LIB_COMPONENT*     CopyItem;
     PICKED_ITEMS_LIST* lastcmd;
 
-    CopyItem = CopyLibEntryStruct( (LIB_COMPONENT*) ItemToCopy );
+    CopyItem = new LIB_COMPONENT( *( (LIB_COMPONENT*) ItemToCopy ) );
 
     if( CopyItem == NULL )
         return;
@@ -54,17 +54,17 @@ void WinEDA_LibeditFrame::GetComponentFromRedoList(wxCommandEvent& event)
         return;
 
     PICKED_ITEMS_LIST* lastcmd = new PICKED_ITEMS_LIST();
-    ITEM_PICKER wrapper(m_currentComponent, UR_LIBEDIT);
+    ITEM_PICKER wrapper(m_component, UR_LIBEDIT);
     lastcmd->PushItem(wrapper);
     GetScreen()->PushCommandToUndoList( lastcmd );
 
     lastcmd = GetScreen()->PopCommandFromRedoList( );
 
     wrapper = lastcmd->PopItem();
-    m_currentComponent = (LIB_COMPONENT*) wrapper.m_PickedItem;
-    if( m_currentComponent )
-        m_currentComponent->SetNext( NULL );
-    CurrentDrawItem = NULL;
+    m_component = (LIB_COMPONENT*) wrapper.m_PickedItem;
+    if( m_component )
+        m_component->SetNext( NULL );
+    m_drawItem = NULL;
     GetScreen()->SetModify();
     DrawPanel->Refresh();
 }
@@ -84,18 +84,18 @@ void WinEDA_LibeditFrame::GetComponentFromUndoList(wxCommandEvent& event)
         return;
 
     PICKED_ITEMS_LIST* lastcmd = new PICKED_ITEMS_LIST();
-    ITEM_PICKER wrapper(m_currentComponent, UR_LIBEDIT);
+    ITEM_PICKER wrapper(m_component, UR_LIBEDIT);
     lastcmd->PushItem(wrapper);
     GetScreen()->PushCommandToRedoList( lastcmd );
 
     lastcmd = GetScreen()->PopCommandFromUndoList( );
 
     wrapper = lastcmd->PopItem();
-    m_currentComponent = (LIB_COMPONENT*) wrapper.m_PickedItem;
+    m_component = (LIB_COMPONENT*) wrapper.m_PickedItem;
 
-    if( m_currentComponent )
-        m_currentComponent->SetNext( NULL );
-    CurrentDrawItem = NULL;
+    if( m_component )
+        m_component->SetNext( NULL );
+    m_drawItem = NULL;
     GetScreen()->SetModify();
     DrawPanel->Refresh();
 }

eeschema/libeditfrm.h

@@ -12,6 +12,7 @@ class SCH_SCREEN;
 class CMP_LIBRARY;
 class LIB_COMPONENT;
 class LIB_ALIAS;
+class LIB_DRAW_ITEM;
 
 /**
  * The component library editor main window.
@@ -39,6 +40,10 @@ public:
     void               CreateNewLibraryPart( wxCommandEvent& event );
     void               OnEditComponentProperties( wxCommandEvent& event );
     void               InstallFieldsEditorDialog(  wxCommandEvent& event );
+    void               LoadOneLibraryPart( wxCommandEvent& event );
+    void               OnViewEntryDoc( wxCommandEvent& event );
+    void               OnCheckComponent( wxCommandEvent& event );
+    void               OnSelectBodyStyle( wxCommandEvent& event );
 
     void               OnUpdateEditingPart( wxUpdateUIEvent& event );
     void               OnUpdateNotEditingPart( wxUpdateUIEvent& event );
@@ -74,17 +79,51 @@ public:
     void               LoadSettings();
     void               SaveSettings();
 
-    LIB_COMPONENT*     GetCurrentComponent( void )
+    LIB_COMPONENT*     GetComponent( void ) { return m_component; }
+
+    CMP_LIBRARY*       GetLibrary( void ) { return m_library; }
+
+    wxString&          GetAliasName( void ) { return m_aliasName; }
+
+    int                GetUnit( void ) { return m_unit; }
+
+    void               SetUnit( int unit )
+    {
+        wxASSERT( unit >= 1 );
+        m_unit = unit;
+    }
+
+    int                GetConvert( void ) { return m_convert; }
+
+    void               SetConvert( int convert )
     {
-        return m_currentComponent;
+        wxASSERT( convert >= 1 );
+        m_convert = convert;
     }
 
+    LIB_DRAW_ITEM*     GetLastDrawItem( void ) { return m_lastDrawItem; }
+
+    void               SetLastDrawItem( LIB_DRAW_ITEM* drawItem )
+    {
+        m_lastDrawItem = drawItem;
+    }
+
+    LIB_DRAW_ITEM*     GetDrawItem( void ) { return m_drawItem; }
+
+    void               SetDrawItem( LIB_DRAW_ITEM* drawItem )
+    {
+        m_drawItem = drawItem;
+    }
+
+    bool               GetShowDeMorgan( void ) { return m_showDeMorgan; }
+
+    void               SetShowDeMorgan( bool show ) { m_showDeMorgan = show; }
+
 private:
 
     // General:
     void               SaveOnePartInMemory();
     void               SelectActiveLibrary();
-    bool               LoadOneLibraryPart();
     void               SaveActiveLibrary( wxCommandEvent& event );
 
     bool               LoadOneLibraryPartAux( CMP_LIB_ENTRY* LibEntry,
@@ -109,26 +148,23 @@ private:
                                   LibDrawPin*    Pin );
     void               StartMovePin( wxDC* DC );
 
-    // Test des pins ( duplicates...)
-    bool               TestPins( LIB_COMPONENT* LibEntry );
-
     // Edition de l'ancre
     void               PlaceAncre();
 
     // Edition des graphismes:
-    LibEDA_BaseStruct* CreateGraphicItem( LIB_COMPONENT* LibEntry, wxDC* DC );
+    LIB_DRAW_ITEM*     CreateGraphicItem( LIB_COMPONENT* LibEntry, wxDC* DC );
     void               GraphicItemBeginDraw( wxDC* DC );
     void               StartMoveDrawSymbol( wxDC* DC );
     void               EndDrawGraphicItem( wxDC* DC );
     void               LoadOneSymbol();
     void               SaveOneSymbol();
     void               EditGraphicSymbol( wxDC* DC,
-                                          LibEDA_BaseStruct* DrawItem );
-    void               EditSymbolText( wxDC* DC, LibEDA_BaseStruct* DrawItem );
+                                          LIB_DRAW_ITEM* DrawItem );
+    void               EditSymbolText( wxDC* DC, LIB_DRAW_ITEM* DrawItem );
     void               RotateSymbolText( wxDC* DC );
     void               DeleteDrawPoly( wxDC* DC );
     LibDrawField*      LocateField( LIB_COMPONENT* LibEntry );
-    LibEDA_BaseStruct* LocateItemUsingCursor();
+    LIB_DRAW_ITEM*     LocateItemUsingCursor();
     void               RotateField( wxDC* DC, LibDrawField* Field );
     void               PlaceField( wxDC* DC, LibDrawField* Field );
     void               EditField( wxDC* DC, LibDrawField* Field );
@@ -152,7 +188,15 @@ protected:
     wxString m_LastLibImportPath;
     wxString m_LastLibExportPath;
 
-    static LIB_COMPONENT* m_currentComponent;
+    static LIB_COMPONENT* m_component;
+    static CMP_LIBRARY*   m_library;
+    static LIB_DRAW_ITEM* m_lastDrawItem;
+    static LIB_DRAW_ITEM* m_drawItem;
+    static wxString       m_aliasName;
+    static int            m_unit;
+    static int            m_convert;
+    static bool           m_showDeMorgan;
+    static wxSize         m_clientSize;
 
     DECLARE_EVENT_TABLE()
 };

eeschema/libfield.cpp

@@ -9,10 +9,11 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
+#include "libcmp.h"
 #include "protos.h"
 #include "libeditfrm.h"
+#include "class_library.h"
 
 
 /* Routines locales */
@@ -20,7 +21,7 @@ static void ShowMoveField( WinEDA_DrawPanel* panel, wxDC* DC, bool erase );
 
 
 /* Variables locales */
-extern int     CurrentUnit;
+extern int     m_unit;
 static wxPoint StartCursor, LastTextPosition;
 
 
@@ -28,7 +29,15 @@ static void ExitMoveField( WinEDA_DrawPanel* Panel, wxDC* DC )
 {
     Panel->ManageCurseur = NULL;
     Panel->ForceCloseManageCurseur = NULL;
-    if( CurrentDrawItem == NULL )
+
+    WinEDA_LibeditFrame* parent = ( WinEDA_LibeditFrame* ) Panel->GetParent();
+
+    if( parent == NULL )
+        return;
+
+    LIB_DRAW_ITEM* item = parent->GetDrawItem();
+
+    if( item == NULL )
         return;
 
     wxPoint curpos = Panel->GetScreen()->m_Curseur;
@@ -36,9 +45,8 @@ static void ExitMoveField( WinEDA_DrawPanel* Panel, wxDC* DC )
     Panel->GetScreen()->m_Curseur = StartCursor;
     ShowMoveField( Panel, DC, TRUE );
     Panel->GetScreen()->m_Curseur = curpos;
-    CurrentDrawItem->m_Flags = 0;
-
-    CurrentDrawItem = NULL;
+    item->m_Flags = 0;
+    parent->SetDrawItem( NULL );
 }
 
 
@@ -49,12 +57,12 @@ void WinEDA_LibeditFrame::StartMoveField( wxDC* DC, LibDrawField* field )
 {
     wxPoint startPos;
 
-    if( ( m_currentComponent == NULL ) || ( field == NULL ) )
+    if( ( m_component == NULL ) || ( field == NULL ) )
         return;
 
-    CurrentDrawItem  = field;
+    m_drawItem  = field;
     LastTextPosition = field->m_Pos;
-    CurrentDrawItem->m_Flags |= IS_MOVED;
+    m_drawItem->m_Flags |= IS_MOVED;
 
     startPos.x = LastTextPosition.x;
     startPos.y = -LastTextPosition.y;
@@ -77,12 +85,17 @@ void WinEDA_LibeditFrame::StartMoveField( wxDC* DC, LibDrawField* field )
 /*****************************************************************/
 static void ShowMoveField( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
 {
-    LibDrawField* Field = (LibDrawField*) CurrentDrawItem;
+    WinEDA_LibeditFrame* parent = (WinEDA_LibeditFrame*) panel->GetParent();
+
+    if( parent == NULL )
+        return;
+
+    LibDrawField* Field = (LibDrawField*) parent->GetDrawItem();
 
     if( Field == NULL )
         return;
 
-    wxString text = Field->GetFullText();
+    wxString text = Field->GetFullText( parent->GetUnit() );
 
     if( erase )
         Field->Draw( panel, DC, wxPoint( 0, 0 ), -1, g_XorMode, &text,
@@ -107,7 +120,7 @@ void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field )
     Field->m_Pos.y = -GetScreen()->m_Curseur.y;
     DrawPanel->CursorOff( DC );
 
-    wxString fieldText = Field->GetFullText();
+    wxString fieldText = Field->GetFullText( m_unit );
 
     Field->Draw( DrawPanel, DC, wxPoint( 0, 0 ), -1, GR_DEFAULT_DRAWMODE,
                  &fieldText, DefaultTransformMatrix );
@@ -116,7 +129,7 @@ void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field )
     GetScreen()->SetModify();
     DrawPanel->ManageCurseur = NULL;
     DrawPanel->ForceCloseManageCurseur = NULL;
-    CurrentDrawItem = NULL;
+    m_drawItem = NULL;
 }
 
 
@@ -148,13 +161,12 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field )
     Get_Message( title, _( "Edit field" ), Text, this );
     Text.Replace( wxT( " " ), wxT( "_" ) );
 
-    /* If the value is changed, this is equivalent to create a new component
-     * from the old one.
-     * So we must check for an existing alias of this "new" component
-     * and change the value only if there is no existing alias with the same
-     * name for this component
+    /* If the value field is changed, this is equivalent to creating a new
+     * component from the old one.  Check for an existing library entry of
+     * this "new" component and change the value only if there is no existing
+     * entry with the same name.
      */
-    if( Field->m_FieldId == VALUE )
+    if( Field->m_FieldId == VALUE && Text != Field->m_Text )
     {
         wxString msg;
 
@@ -173,19 +185,19 @@ names in the alias list." ),
         /* Test for an existing entry in the library to prevent duplicate
          * entry names.
          */
-        if( CurrentLib && CurrentLib->FindEntry( Text ) != NULL )
+        if( m_library && m_library->FindEntry( Text ) != NULL )
         {
             msg.Printf( _( "The field name <%s> conflicts with an existing \
 entry in the component library <%s>.\nPlease choose another name that does \
 not conflict with any library entries." ),
                         (const wxChar*) Text,
-                        (const wxChar*) CurrentLib->GetName() );
+                        (const wxChar*) m_library->GetName() );
             DisplayError( this, msg );
             return;
         }
     }
 
-    wxString fieldText = Field->GetFullText();
+    wxString fieldText = Field->GetFullText( m_unit );
 
     Field->Draw( DrawPanel, DC, wxPoint( 0, 0 ), -1, g_XorMode, &fieldText,
                  DefaultTransformMatrix );
@@ -200,7 +212,7 @@ not conflict with any library entries." ),
         DisplayError( this, _( "No new text: no change" ) );
     }
 
-    fieldText = Field->GetFullText();
+    fieldText = Field->GetFullText( m_unit );
     int drawMode = g_XorMode;
 
     if( Field->m_Flags == 0 )
@@ -229,7 +241,7 @@ void WinEDA_LibeditFrame::RotateField( wxDC* DC, LibDrawField* Field )
     DrawPanel->CursorOff( DC );
     GRSetDrawMode( DC, g_XorMode );
 
-    wxString fieldText = Field->GetFullText();
+    wxString fieldText = Field->GetFullText( m_unit );
 
     Field->Draw( DrawPanel, DC, wxPoint( 0, 0 ), -1, g_XorMode, &fieldText,
                  DefaultTransformMatrix );
@@ -283,37 +295,35 @@ LibDrawField* WinEDA_LibeditFrame::LocateField( LIB_COMPONENT* LibEntry )
 }
 
 
-LibEDA_BaseStruct* WinEDA_LibeditFrame::LocateItemUsingCursor()
+LIB_DRAW_ITEM* WinEDA_LibeditFrame::LocateItemUsingCursor()
 {
-    LibEDA_BaseStruct* DrawEntry = CurrentDrawItem;
+    LIB_DRAW_ITEM* DrawEntry = m_drawItem;
 
-    if( m_currentComponent == NULL )
+    if( m_component == NULL )
         return NULL;
 
     if( ( DrawEntry == NULL ) || ( DrawEntry->m_Flags == 0 ) )
     {
-        DrawEntry = LocatePin( GetScreen()->m_Curseur, m_currentComponent,
-                               CurrentUnit, CurrentConvert );
+        DrawEntry = LocatePin( GetScreen()->m_Curseur, m_component,
+                               m_unit, m_convert );
         if( DrawEntry == NULL )
         {
-            DrawEntry = CurrentDrawItem =
+            DrawEntry = m_drawItem =
                 LocateDrawItem( (SCH_SCREEN*) GetScreen(),
-                                GetScreen()->m_MousePosition,
-                                m_currentComponent, CurrentUnit,
-                                CurrentConvert, LOCATE_ALL_DRAW_ITEM );
+                                GetScreen()->m_MousePosition, m_component,
+                                m_unit, m_convert, LOCATE_ALL_DRAW_ITEM );
         }
         if( DrawEntry == NULL )
         {
-            DrawEntry = CurrentDrawItem =
+            DrawEntry = m_drawItem =
                 LocateDrawItem( (SCH_SCREEN*) GetScreen(),
-                                GetScreen()->m_Curseur, m_currentComponent,
-                                CurrentUnit, CurrentConvert,
-                                LOCATE_ALL_DRAW_ITEM );
+                                GetScreen()->m_Curseur, m_component,
+                                m_unit, m_convert, LOCATE_ALL_DRAW_ITEM );
         }
         if( DrawEntry == NULL )
         {
-            DrawEntry = CurrentDrawItem =
-                (LibEDA_BaseStruct*) LocateField( m_currentComponent );
+            DrawEntry = m_drawItem =
+                (LIB_DRAW_ITEM*) LocateField( m_component );
         }
     }
 

eeschema/load_one_schematic_file.cpp

@@ -5,12 +5,13 @@
 #include "fctsys.h"
 #include "confirm.h"
 #include "kicad_string.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
 #include "class_marker_sch.h"
 
+
 /* in read_from_file_schematic_items_description.cpp */
 SCH_ITEM* ReadTextDescr( FILE* aFile, wxString& aMsgDiag, char* aLine,
                          int aBufsize, int* aLineNum,

eeschema/locate.cpp

@@ -5,16 +5,19 @@
 #include "fctsys.h"
 #include "common.h"
 #include "program.h"
-#include "libcmp.h"
-#include "general.h"
 #include "trigo.h"
 #include "macros.h"
-#include "class_marker_sch.h"
 
+#include "libcmp.h"
+#include "general.h"
+#include "class_marker_sch.h"
 #include "protos.h"
+#include "class_library.h"
+
 
 /* Routines Locales */
-static bool DrawStructInBox(int x1, int y1, int x2, int y2, SCH_ITEM *DrawStruct);
+static bool DrawStructInBox( int x1, int y1, int x2, int y2,
+                             SCH_ITEM *DrawStruct );
 static SCH_ITEM* LastSnappedStruct = NULL;
 static bool IsBox1InBox2( int StartX1, int StartY1, int EndX1, int EndY1,
                           int StartX2, int StartY2, int EndX2, int EndY2 );
@@ -612,7 +615,7 @@ static bool IsBox1InBox2( int StartX1, int StartY1, int EndX1, int EndY1,
 
 
 /*********************************************************************************/
-LibEDA_BaseStruct* LocateDrawItem( SCH_SCREEN*    Screen,
+LIB_DRAW_ITEM* LocateDrawItem( SCH_SCREEN*    Screen,
                                const wxPoint& aRefPoint,
                                LIB_COMPONENT* LibEntry,
                                int            Unit,
@@ -626,7 +629,7 @@ LibEDA_BaseStruct* LocateDrawItem( SCH_SCREEN*    Screen,
  *  remember the Y axis is from bottom to top in library entries for graphic items.
  */
 {
-    LibEDA_BaseStruct* DrawItem;
+    LIB_DRAW_ITEM* DrawItem;
 
     if( LibEntry == NULL )
         return NULL;
@@ -717,7 +720,7 @@ LibDrawPin* LocatePinByNumber( const wxString& ePin_Number,
  * @return a pointer on the pin, or NULL if not found
  */
 {
-    LibEDA_BaseStruct* DrawItem;
+    LIB_DRAW_ITEM* DrawItem;
     LIB_COMPONENT* Entry;
     LibDrawPin* Pin;
     int Unit, Convert;
@@ -760,7 +763,7 @@ LibDrawPin* LocatePinByNumber( const wxString& ePin_Number,
 
 
 /*******************************************************************/
-LibEDA_BaseStruct* LocatePin( const wxPoint& RefPos, LIB_COMPONENT* Entry,
+LIB_DRAW_ITEM* LocatePin( const wxPoint& RefPos, LIB_COMPONENT* Entry,
                           int Unit, int convert, SCH_COMPONENT* DrawLibItem )
 /*******************************************************************/
 
@@ -779,7 +782,7 @@ LibEDA_BaseStruct* LocatePin( const wxPoint& RefPos, LIB_COMPONENT* Entry,
         return NULL;
     }
 
-    LibEDA_BaseStruct* DrawItem = Entry->m_Drawings;
+    LIB_DRAW_ITEM* DrawItem = Entry->m_Drawings;
     for( ; DrawItem != NULL; DrawItem = DrawItem->Next() )
     {
         if( DrawItem->Type() == COMPONENT_PIN_DRAW_TYPE ) /* Pin Trouvee */

eeschema/menubar.cpp

@@ -9,10 +9,10 @@
 #include "fctsys.h"
 #include "common.h"
 #include "appl_wxstruct.h"
+#include "bitmaps.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-#include "bitmaps.h"
 #include "protos.h"
 #include "eeschema_id.h"
 #include "hotkeys.h"

eeschema/netform.cpp

@@ -8,13 +8,14 @@
 #include "confirm.h"
 #include "kicad_string.h"
 #include "gestfich.h"
+#include "appl_wxstruct.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
-#include "appl_wxstruct.h"
-
 #include "protos.h"
+#include "class_library.h"
+
 
 /* Routines locales */
 static void Write_GENERIC_NetList( WinEDA_SchematicFrame* frame, const wxString& FullFileName );
@@ -110,7 +111,7 @@ static SCH_COMPONENT* FindNextComponentAndCreatPinList(
 {
     SCH_COMPONENT* Component = NULL;
     LIB_COMPONENT* Entry;
-    LibEDA_BaseStruct* DEntry;
+    LIB_DRAW_ITEM* DEntry;
 
     s_SortedComponentPinList.clear();
     for( ; DrawList != NULL; DrawList = DrawList->Next() )
@@ -767,7 +768,7 @@ static void FindAllsInstancesOfComponent( SCH_COMPONENT* Component_in,
 {
     EDA_BaseStruct* SchItem;
     SCH_COMPONENT* Component2;
-    LibEDA_BaseStruct* DEntry;
+    LIB_DRAW_ITEM* DEntry;
     DrawSheetPath* sheet;
     wxString str, Reference = Component_in->GetRef( Sheet_in );
 

eeschema/netlist.cpp

@@ -4,15 +4,16 @@
 
 #include "fctsys.h"
 #include "common.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-
 #include "netlist.h" /* Definitions generales liees au calcul de netliste */
 #include "protos.h"
+#include "class_library.h"
 
 #include "algorithm"
 
+
 // Buffer to build the list of items used in netlist and erc calculations
 NETLIST_OBJECT_LIST g_NetObjectslist;
 
@@ -354,7 +355,7 @@ static void ListeObjetConnection( DrawSheetPath*                sheetlist,
     NETLIST_OBJECT*                new_item;
     SCH_COMPONENT*                 DrawLibItem;
     LIB_COMPONENT*                 Entry;
-    LibEDA_BaseStruct*             DEntry;
+    LIB_DRAW_ITEM*                 DEntry;
     Hierarchical_PIN_Sheet_Struct* SheetLabel;
     DrawSheetPath                  list;
 

eeschema/netlist.h

@@ -5,6 +5,10 @@
 #ifndef _NETLIST_H_
 #define _NETLIST_H_
 
+
+#include "class_libentry.h"
+
+
 #define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1"
 
 #define ISBUS 1

eeschema/netlist_control.cpp

@@ -17,13 +17,14 @@
 #include "common.h"
 #include "confirm.h"
 #include "gestfich.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
 #include "protos.h"
 #include "netlist_control.h"
 
+
 // ID for configuration:
 #define CUSTOM_NETLIST_TITLE   wxT( "CustomNetlistTitle" )
 #define CUSTOM_NETLIST_COMMAND wxT( "CustomNetlistCommand" )

eeschema/onleftclick.cpp

@@ -9,12 +9,11 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "class_marker_sch.h"
-
 #include "protos.h"
 
+
 static wxArrayString s_CmpNameList;
 static wxArrayString s_PowerNameList;
 

eeschema/onrightclick.cpp

@@ -8,16 +8,15 @@
 #include "eeschema_id.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
+#include "bitmaps.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "class_marker_sch.h"
-
 #include "protos.h"
 #include "hotkeys.h"
+#include "class_library.h"
 
-#include "bitmaps.h"
 
 /* functions to add commands and submenus depending on the item */
 static void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame );

eeschema/operations_on_items_lists.cpp

@@ -8,18 +8,20 @@
 #include "appl_wxstruct.h"
 #include "common.h"
 #include "class_drawpanel.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "class_marker_sch.h"
-
 #include "protos.h"
 
+
 /* Exported Functions */
 void MoveItemsInList( PICKED_ITEMS_LIST& aItemsList, const wxPoint aMoveVector );
 void MirrorListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& aMirrorPoint );
-void               DeleteItemsInList( WinEDA_DrawPanel*  panel, PICKED_ITEMS_LIST& aItemsList );
-void               DuplicateItemsInList( SCH_SCREEN* screen, PICKED_ITEMS_LIST& aItemsList, const wxPoint aMoveVector  );
+void DeleteItemsInList( WinEDA_DrawPanel* panel,
+                        PICKED_ITEMS_LIST& aItemsList );
+void DuplicateItemsInList( SCH_SCREEN* screen, PICKED_ITEMS_LIST& aItemsList,
+                           const wxPoint aMoveVector  );
 
 
 /*****************************************************************************

eeschema/pinedit-dialog.cpp

@@ -26,10 +26,10 @@ void InstallPineditFrame( WinEDA_LibeditFrame* parent, wxDC* DC,
     wxPoint MousePos = parent->GetScreen()->m_Curseur;
     int accept = TRUE;
 
-    if ( ( CurrentDrawItem == NULL )
-         || ( CurrentDrawItem->Type() == COMPONENT_PIN_DRAW_TYPE ) )
+    if ( ( parent->GetDrawItem() == NULL )
+         || ( parent->GetDrawItem()->Type() == COMPONENT_PIN_DRAW_TYPE ) )
     {
-        LibDrawPin * Pin = (LibDrawPin *) CurrentDrawItem;
+        LibDrawPin * Pin = (LibDrawPin *) parent->GetDrawItem();
         WinEDA_PinPropertiesFrame dlg( parent );
         accept = dlg.ShowModal();
 
@@ -81,7 +81,7 @@ WinEDA_PinPropertiesFrame::WinEDA_PinPropertiesFrame( )
 
 WinEDA_PinPropertiesFrame::WinEDA_PinPropertiesFrame( WinEDA_LibeditFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-LibDrawPin * CurrentPin = (LibDrawPin *) CurrentDrawItem;
+    LibDrawPin * CurrentPin = (LibDrawPin *) parent->GetDrawItem();
 
     m_Parent = parent;
     if ( CurrentPin )
@@ -326,7 +326,7 @@ void WinEDA_PinPropertiesFrame::SetValuesInDialog(void)
 /*******************************************************/
 {
     wxString number;
-    LibDrawPin * CurrentPin = (LibDrawPin *) CurrentDrawItem;
+    LibDrawPin * CurrentPin = (LibDrawPin *) m_Parent->GetDrawItem();
     wxString msg;
     int tmp, ii;
 

eeschema/plot.cpp

@@ -11,9 +11,10 @@
 #include "trigo.h"
 
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
 #include "protos.h"
+#include "class_library.h"
+
 
 /* Local Variables : */
 static void Plot_Hierarchical_PIN_Sheet( PLOTTER*                       plotter,
@@ -64,7 +65,7 @@ static void PlotLibPart( PLOTTER* plotter, SCH_COMPONENT* DrawLibItem )
     Multi   = DrawLibItem->m_Multi;
     convert = DrawLibItem->m_Convert;
 
-    for( LibEDA_BaseStruct* DEntry = Entry->m_Drawings;
+    for( LIB_DRAW_ITEM* DEntry = Entry->m_Drawings;
         DEntry != NULL; DEntry = DEntry->Next() )
     {
         /* Elimination des elements non relatifs a l'unite */

eeschema/plotdxf.cpp

@@ -19,14 +19,15 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "plot_common.h"
 #include "confirm.h"
+#include "worksheet.h"
+
 #include "program.h"
-#include "libcmp.h"
 #include "general.h"
-#include "worksheet.h"
-#include "plot_common.h"
 #include "protos.h"
 
+
 /* Variables locales : */
 static bool  Plot_Sheet_Ref = TRUE;
 

eeschema/plotps.cpp

@@ -20,11 +20,11 @@
 #include "gr_basic.h"
 #include "common.h"
 #include "confirm.h"
-#include "program.h"
-#include "libcmp.h"
-#include "general.h"
 #include "worksheet.h"
 #include "plot_common.h"
+
+#include "program.h"
+#include "general.h"
 #include "protos.h"
 
 enum PageFormatReq {