Tag release version 5.1.7.

Remove threading from Python wrapper
Python threading can cause issues with zone filler, connectivity calculations and many other parts. This forces the emitted code to hold the GIL when running. Fixes https://gitlab.com/kicad/code/kicad/issues/4436
2020-09-25 15:49:58 -04:00 · 2020-09-15 17:11:12 -07:00 · 2020-09-15 14:18:23 +02:00 · 2020-09-12 06:49:51 -07:00 · 2020-09-10 17:04:01 +02:00 · 2020-09-08 19:02:17 +02:00
442 changed files with 12300 additions and 19915 deletions
@@ -44,7 +44,7 @@ if( APPLE )
 endif()

 find_file( S3DSG_VERSION_FILE sg_version.h
-        PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH )
+        PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

 if( NOT ${S3DSG_VERSION_FILE} STREQUAL "S3DSG_VERSION_FILE-NOTFOUND" )

@@ -66,7 +66,6 @@ CINFO3D_VISU::CINFO3D_VISU() :
    m_boardCenter = SFVEC3F( 0.0f );

    m_boardBoudingBox.Reset();
-    m_board2dBBox3DU.Reset();

    m_layers_container2D.clear();
    m_layers_holes2D.clear();
@@ -273,13 +272,9 @@ void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter )
 {
    wxLogTrace( m_logTrace, wxT( "CINFO3D_VISU::InitSettings" ) );

-    // Calculates the board bounding box
-    // First, use only the board outlines
-    EDA_RECT bbbox = m_board->ComputeBoundingBox( true );
-
-    // If no outlines, use the board with items
-    if( ( bbbox.GetWidth() == 0 ) && ( bbbox.GetHeight() == 0 ) )
-        bbbox = m_board->ComputeBoundingBox( false );
+    // Calculates the board bounding box (board outlines + items)
+    // to ensure any item, even outside the board outlines can be seen
+    EDA_RECT bbbox = m_board->ComputeBoundingBox( false );

    // Gives a non null size to avoid issues in zoom / scale calculations
    if( ( bbbox.GetWidth() == 0 ) && ( bbbox.GetHeight() == 0 ) )
@@ -462,8 +457,6 @@ void CINFO3D_VISU::createBoardPolygon()
        errmsg.append( _( "Cannot determine the board outline." ) );
        wxLogMessage( errmsg );
    }
-
-    Polygon_Calc_BBox_3DU( m_board_poly, m_board2dBBox3DU, m_biuTo3Dunits );
 }


@@ -550,9 +550,6 @@ class CINFO3D_VISU
    /// 3d bouding box of the pcb board in 3d units
    CBBOX   m_boardBoudingBox;

-    /// 2d bouding box of the pcb board in 3d units
-    CBBOX2D m_board2dBBox3DU;
-
    /// It contains polygon contours for each layer
    MAP_POLY          m_layers_poly;

@@ -62,13 +62,11 @@
 static int s_textWidth;
 static CGENERICCONTAINER2D *s_dstcontainer = NULL;
 static float s_biuTo3Dunits;
-static const CBBOX2D *s_boardBBox3DU = NULL;
 static const BOARD_ITEM *s_boardItem = NULL;

 // This is a call back function, used by DrawGraphicText to draw the 3D text shape:
 void addTextSegmToContainer( int x0, int y0, int xf, int yf, void* aData )
 {
-    wxASSERT( s_boardBBox3DU != NULL );
    wxASSERT( s_dstcontainer != NULL );

    const SFVEC2F start3DU( x0 * s_biuTo3Dunits, -y0 * s_biuTo3Dunits );
@@ -76,7 +74,7 @@ void addTextSegmToContainer( int x0, int y0, int xf, int yf, void* aData )

    if( Is_segment_a_circle( start3DU, end3DU ) )
        s_dstcontainer->Add( new CFILLEDCIRCLE2D( start3DU,
-                                                  s_textWidth * s_biuTo3Dunits,
+                                                  ( s_textWidth / 2 ) * s_biuTo3Dunits,
                                                  *s_boardItem) );
    else
        s_dstcontainer->Add( new CROUNDSEGMENT2D( start3DU,
@@ -103,7 +101,6 @@ void CINFO3D_VISU::AddShapeWithClearanceToContainer( const TEXTE_PCB* aTextPCB,
    s_dstcontainer = aDstContainer;
    s_textWidth    = aTextPCB->GetThickness() + ( 2 * aClearanceValue );
    s_biuTo3Dunits = m_biuTo3Dunits;
-    s_boardBBox3DU = &m_board2dBBox3DU;

    // not actually used, but needed by DrawGraphicText
    const COLOR4D dummy_color = COLOR4D::BLACK;
@@ -228,7 +225,6 @@ void CINFO3D_VISU::AddGraphicsShapesWithClearanceToContainer( const MODULE* aMod
    s_boardItem    = (const BOARD_ITEM *)&aModule->Value();
    s_dstcontainer = aDstContainer;
    s_biuTo3Dunits = m_biuTo3Dunits;
-    s_boardBBox3DU = &m_board2dBBox3DU;

    for( unsigned ii = 0; ii < texts.size(); ++ii )
    {
@@ -390,9 +386,22 @@ void CINFO3D_VISU::createNewPadWithClearance( const D_PAD* aPad,
    case PAD_SHAPE_RECT:
    {
        // see pcbnew/board_items_to_polygon_shape_transform.cpp
-
        wxPoint corners[4];
-        aPad->BuildPadPolygon( corners, wxSize( 0, 0), aPad->GetOrientation() );
+        bool drawOutline;
+
+        // For aClearanceValue.x == aClearanceValue.y and > 0 we use the pad shape
+        // and draw outlines with thicknes = aClearanceValue.
+        // Otherwise we draw only the inflated/deflated shape
+        if( aClearanceValue.x > 0 && aClearanceValue.x == aClearanceValue.y )
+        {
+            drawOutline = true;
+            aPad->BuildPadPolygon( corners, wxSize( 0, 0 ), aPad->GetOrientation() );
+        }
+        else
+        {
+            drawOutline = false;
+            aPad->BuildPadPolygon( corners, aClearanceValue, aPad->GetOrientation() );
+        }

        SFVEC2F corners3DU[4];

@@ -420,20 +429,23 @@ void CINFO3D_VISU::createNewPadWithClearance( const D_PAD* aPad,
        // Add the PAD contours
        // Round segments cannot have 0-length elements, so we approximate them
        // as a small circle
-        for( int i = 1; i <= 4; i++ )
+        if( drawOutline )
        {
-            if( Is_segment_a_circle( corners3DU[i - 1], corners3DU[i & 3] ) )
+            for( int i = 1; i <= 4; i++ )
            {
-                aDstContainer->Add( new CFILLEDCIRCLE2D( corners3DU[i - 1],
-                                        aClearanceValue.x * m_biuTo3Dunits,
-                                        *aPad ) );
-            }
-            else
-            {
-                aDstContainer->Add( new CROUNDSEGMENT2D( corners3DU[i - 1],
-                                                         corners3DU[i & 3],
-                                                         aClearanceValue.x * 2.0f * m_biuTo3Dunits,
-                                                         *aPad ) );
+                if( Is_segment_a_circle( corners3DU[i - 1], corners3DU[i & 3] ) )
+                {
+                    aDstContainer->Add( new CFILLEDCIRCLE2D( corners3DU[i - 1],
+                                            aClearanceValue.x * m_biuTo3Dunits,
+                                            *aPad ) );
+                }
+                else
+                {
+                    aDstContainer->Add( new CROUNDSEGMENT2D( corners3DU[i - 1],
+                                                             corners3DU[i & 3],
+                                                             aClearanceValue.x * 2.0f * m_biuTo3Dunits,
+                                                             *aPad ) );
+                }
            }
        }
    }
@@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -57,6 +57,9 @@ const wxChar * EDA_3D_CANVAS::m_logTrace = wxT( "KI_TRACE_EDA_3D_CANVAS" );

 const float EDA_3D_CANVAS::m_delta_move_step_factor = 0.7f;

+// A custom event, used to call DoRePaint during an idle time
+wxDEFINE_EVENT( wxEVT_REFRESH_CUSTOM_COMMAND, wxEvent);
+

 BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas )
    EVT_PAINT( EDA_3D_CANVAS::OnPaint )
@@ -78,6 +81,7 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas )

    // other events
    EVT_ERASE_BACKGROUND( EDA_3D_CANVAS::OnEraseBackground )
+    EVT_CUSTOM(wxEVT_REFRESH_CUSTOM_COMMAND, ID_CUSTOM_EVENT_1, EDA_3D_CANVAS::OnRefreshRequest )
    EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START,
                    ID_POPUP_3D_VIEW_END, EDA_3D_CANVAS::OnPopUpMenu )

@@ -312,17 +316,22 @@ void EDA_3D_CANVAS::DisplayStatus()
 }


-void EDA_3D_CANVAS::OnPaint( wxPaintEvent &event )
+void EDA_3D_CANVAS::OnPaint( wxPaintEvent& aEvent )
 {
    // Please have a look at:
    // https://lists.launchpad.net/kicad-developers/msg25149.html
    // wxPaintDC( this );
-    // event.Skip( false );
+    // aEvent.Skip( false );
+    DoRePaint();
+}

+
+void EDA_3D_CANVAS::DoRePaint()
+{
    // SwapBuffer requires the window to be shown before calling
    if( !IsShownOnScreen() )
    {
-        wxLogTrace( m_logTrace, "EDA_3D_CANVAS::OnPaint !IsShown" );
+        wxLogTrace( m_logTrace, "EDA_3D_CANVAS::DoRePaint !IsShown" );
        return;
    }

@@ -856,13 +865,13 @@ void EDA_3D_CANVAS::restart_editingTimeOut_Timer()

 void EDA_3D_CANVAS::OnTimerTimeout_Redraw( wxTimerEvent &event )
 {
-    (void)event;
+    Request_refresh( true );
+}

-    //Refresh();
-    //Update();

-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+void EDA_3D_CANVAS::OnRefreshRequest( wxEvent& aEvent )
+{
+   DoRePaint();
 }


@@ -870,22 +879,12 @@ void EDA_3D_CANVAS::Request_refresh( bool aRedrawImmediately )
 {
    if( aRedrawImmediately )
    {
-        // On some systems, just calling Refresh does not work always
-        // (Issue experienced on Win7 MSYS2)
-        //Refresh();
-        //Update();
-
-        // Using PostEvent will take priority to other events, like
-        // mouse movements, keys, etc.
-        wxPaintEvent redrawEvent;
+        // Just calling Refresh() does not work always
+        // Using an event to call DoRepaint ensure the repaint code will be executed,
+        // and PostEvent will take priority to other events like mouse movements, keys, etc.
+        // and is executed during the next idle time
+        wxCommandEvent redrawEvent( wxEVT_REFRESH_CUSTOM_COMMAND, ID_CUSTOM_EVENT_1 );
        wxPostEvent( this, redrawEvent );
-
-        // This behaves the same
-        // wxQueueEvent( this,
-                        // From wxWidget documentation: "The heap-allocated and
-                        // non-NULL event to queue, the function takes ownership of it."
-        //               new wxPaintEvent()
-        //               );
    }
    else
    {
@@ -1085,7 +1084,10 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode )
        m_settings.CameraGet().SetT0_and_T1_current_T();
        m_settings.CameraGet().Reset_T1();
        m_settings.CameraGet().RotateX_T1( glm::radians(  -90.0f ) );
-        m_settings.CameraGet().RotateZ_T1( glm::radians( -180.0f ) );
+        // The rotation angle should be 180.
+        // We use 179.999 (180 - epsilon) to avoid a full 360 deg rotation when
+        // using 180 deg if the previous rotated position was already 180 deg
+        m_settings.CameraGet().RotateZ_T1( glm::radians( -179.999f ) );
        request_start_moving_camera();
        return true;

@@ -1101,7 +1103,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode )
        m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER );
        m_settings.CameraGet().SetT0_and_T1_current_T();
        m_settings.CameraGet().Reset_T1();
-        m_settings.CameraGet().RotateY_T1( glm::radians( 180.0f ) );
+        m_settings.CameraGet().RotateY_T1( glm::radians( 179.999f ) ); // Rotation = 180-epsilon
        request_start_moving_camera(
                    glm::min( glm::max( m_settings.CameraGet().ZoomGet(), 0.5f ), 1.125f ) );
        return true;
@@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -135,10 +135,21 @@ class EDA_3D_CANVAS : public HIDPI_GL_CANVAS

 private:

-    void OnPaint( wxPaintEvent &event );
+    /** Called by a wxPaintEvent event
+     */
+    void OnPaint( wxPaintEvent& aEvent );
+
+    /**
+     * The actual function to repaint the canvas.
+     * It is usually called by OnPaint() but because it does not use a wxPaintDC
+     * it can be called outside a wxPaintEvent
+     */
+    void DoRePaint();

    void OnEraseBackground( wxEraseEvent &event );

+    void OnRefreshRequest( wxEvent& aEvent );
+
    void OnMouseWheel( wxMouseEvent &event );

 #if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
@@ -198,6 +198,7 @@ void C3D_RENDER_OGL_LEGACY::setupMaterials()
                                              0.00f, 0.30f );

        m_materials.m_Copper.m_Shininess = shininessfactor * 128.0f;
+        m_materials.m_Copper.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );


        // Paste material mixed with paste color
@@ -213,6 +214,7 @@ void C3D_RENDER_OGL_LEGACY::setupMaterials()
                                                  m_settings.m_SolderPasteColor.b );

        m_materials.m_Paste.m_Shininess = 0.1f * 128.0f;
+        m_materials.m_Paste.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );


        // Silk screen material mixed with silk screen color
@@ -228,6 +230,7 @@ void C3D_RENDER_OGL_LEGACY::setupMaterials()
                                                  m_settings.m_SilkScreenColor.b + 0.10f );

        m_materials.m_SilkS.m_Shininess = 0.078125f * 128.0f;
+        m_materials.m_SilkS.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );


        // Solder mask material mixed with solder mask color
@@ -244,6 +247,7 @@ void C3D_RENDER_OGL_LEGACY::setupMaterials()

        m_materials.m_SolderMask.m_Shininess = 0.8f * 128.0f;
        m_materials.m_SolderMask.m_Transparency = 0.17f;
+        m_materials.m_SolderMask.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );


        // Epoxy material
@@ -258,6 +262,7 @@ void C3D_RENDER_OGL_LEGACY::setupMaterials()
                                                        20.0f / 255.0f );

        m_materials.m_EpoxyBoard.m_Shininess = 0.1f * 128.0f;
+        m_materials.m_EpoxyBoard.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );
    }
    else    // Technical Mode
    {
@@ -269,34 +274,40 @@ void C3D_RENDER_OGL_LEGACY::setupMaterials()
        m_materials.m_Copper.m_Ambient   = matAmbientColor;
        m_materials.m_Copper.m_Specular  = matSpecularColor;
        m_materials.m_Copper.m_Shininess = matShininess;
+        m_materials.m_Copper.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );

        // Paste material
        m_materials.m_Paste.m_Ambient   = matAmbientColor;
        m_materials.m_Paste.m_Specular  = matSpecularColor;
        m_materials.m_Paste.m_Shininess = matShininess;
+        m_materials.m_Paste.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );

        // Silk screen material
        m_materials.m_SilkS.m_Ambient   = matAmbientColor;
        m_materials.m_SilkS.m_Specular  = matSpecularColor;
        m_materials.m_SilkS.m_Shininess = matShininess;
+        m_materials.m_SilkS.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );

        // Solder mask material
        m_materials.m_SolderMask.m_Ambient   = matAmbientColor;
        m_materials.m_SolderMask.m_Specular  = matSpecularColor;
        m_materials.m_SolderMask.m_Shininess = matShininess;
        m_materials.m_SolderMask.m_Transparency = 0.17f;
+        m_materials.m_SolderMask.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );

        // Epoxy material
        m_materials.m_EpoxyBoard.m_Ambient   = matAmbientColor;
        m_materials.m_EpoxyBoard.m_Diffuse   = m_settings.m_BoardBodyColor;
        m_materials.m_EpoxyBoard.m_Specular  = matSpecularColor;
        m_materials.m_EpoxyBoard.m_Shininess = matShininess;
+        m_materials.m_EpoxyBoard.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );

        // Gray material (used for example in technical vias and pad holes)
        m_materials.m_GrayMaterial.m_Ambient    = SFVEC3F( 0.8f, 0.8f, 0.8f );
        m_materials.m_GrayMaterial.m_Diffuse    = SFVEC3F( 0.3f, 0.3f, 0.3f );
        m_materials.m_GrayMaterial.m_Specular   = SFVEC3F( 0.4f, 0.4f, 0.4f );
        m_materials.m_GrayMaterial.m_Shininess  = 0.01f * 128.0f;
+        m_materials.m_GrayMaterial.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );
    }
 }

@@ -347,6 +358,7 @@ void C3D_RENDER_OGL_LEGACY::set_layer_material( PCB_LAYER_ID aLayerID )
                                    m_materials.m_Plastic.m_Diffuse.b * 0.7f );

            m_materials.m_Plastic.m_Shininess = 0.078125f * 128.0f;
+            m_materials.m_Plastic.m_Emissive = SFVEC3F( 0.0f, 0.0f, 0.0f );
            OGL_SetMaterial( m_materials.m_Plastic );
        break;

@@ -286,7 +286,9 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )

    m_outlineBoard2dObjects = new CCONTAINER2D;

-    if( ((const SHAPE_POLY_SET &)m_settings.GetBoardPoly()).OutlineCount() == 1 )
+    const int outlineCount = m_settings.GetBoardPoly().OutlineCount();
+
+    if( outlineCount > 0 )
    {
        float divFactor = 0.0f;

@@ -299,12 +301,16 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
        SHAPE_POLY_SET boardPolyCopy = m_settings.GetBoardPoly();
        boardPolyCopy.Fracture( SHAPE_POLY_SET::PM_FAST );

-        Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
-                    boardPolyCopy,
-                    *m_outlineBoard2dObjects,
-                    m_settings.BiuTo3Dunits(),
-                    divFactor,
-                    (const BOARD_ITEM &)*m_settings.GetBoard() );
+        for( int iOutlinePolyIdx = 0; iOutlinePolyIdx < outlineCount; iOutlinePolyIdx++ )
+        {
+            Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
+                        boardPolyCopy,
+                        *m_outlineBoard2dObjects,
+                        m_settings.BiuTo3Dunits(),
+                        divFactor,
+                        *dynamic_cast<const BOARD_ITEM*>( m_settings.GetBoard() ),
+                        iOutlinePolyIdx );
+        }

        if( m_settings.GetFlag( FL_SHOW_BOARD_BODY ) )
        {
@@ -408,17 +408,16 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
        CGENERICCONTAINER2D &aDstContainer,
        float aBiuTo3DunitsScale,
        float aDivFactor,
-        const BOARD_ITEM &aBoardItem )
+        const BOARD_ITEM &aBoardItem,
+        int aPolyIndex )
 {
-    BOX2I pathBounds = aMainPath.BBox();
-
    // Get the path

-    wxASSERT( aMainPath.OutlineCount() == 1 );
-    const SHAPE_POLY_SET::POLYGON& curr_polywithholes = aMainPath.CPolygon( 0 );
+    wxASSERT( aPolyIndex < aMainPath.OutlineCount() );

-    wxASSERT( curr_polywithholes.size() == 1 );
-    const SHAPE_LINE_CHAIN& path = curr_polywithholes[0];   // a simple polygon
+    const SHAPE_LINE_CHAIN& path = aMainPath.COutline( aPolyIndex );
+
+    BOX2I pathBounds = path.BBox();

    // Convert the points to segments class
    CBBOX2D bbox;
@@ -430,8 +429,10 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
    // Contains a closed polygon used to calc if points are inside
    SEGMENTS segments;

-    segments_and_normals.resize( path.PointCount() );
-    segments.resize( path.PointCount() );
+    segments_and_normals.reserve( path.PointCount() );
+    segments.reserve( path.PointCount() );
+
+    SFVEC2F prevPoint;

    for( int i = 0; i < path.PointCount(); i++ )
    {
@@ -440,9 +441,23 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
        const SFVEC2F point ( (float)( a.x) * aBiuTo3DunitsScale,
                              (float)(-a.y) * aBiuTo3DunitsScale );

-        bbox.Union( point );
-        segments_and_normals[i].m_Start = point;
-        segments[i].m_Start = point;
+        // Only add points that are not coincident
+        if( (i == 0) ||
+            (fabs(prevPoint.x - point.x) > FLT_EPSILON) ||
+            (fabs(prevPoint.y - point.y) > FLT_EPSILON) )
+        {
+            prevPoint = point;
+
+            bbox.Union( point );
+
+            SEGMENT_WITH_NORMALS sn;
+            sn.m_Start = point;
+            segments_and_normals.push_back( sn );
+
+            POLYSEGMENT ps;
+            ps.m_Start = point;
+            segments.push_back( ps );
+        }
    }

    bbox.ScaleNextUp();
@@ -518,13 +533,13 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
            segments_and_normals[i].m_Normals.m_Start = normalSeg;
        else
            segments_and_normals[i].m_Normals.m_Start =
-                glm::normalize( (((normalBeforeSeg * dotBefore ) + normalSeg) * 0.5f) );
+                glm::normalize( (normalBeforeSeg * dotBefore ) + normalSeg );

        if( dotAfter < 0.7f )
            segments_and_normals[i].m_Normals.m_End = normalSeg;
        else
            segments_and_normals[i].m_Normals.m_End =
-                glm::normalize( (((normalAfterSeg  * dotAfter  ) + normalSeg) * 0.5f) );
+                glm::normalize( (normalAfterSeg * dotAfter ) + normalSeg );
    }

    if( aDivFactor == 0.0f )
@@ -711,35 +726,6 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
 }


-void Polygon_Calc_BBox_3DU( const SHAPE_POLY_SET &aPolysList,
-                            CBBOX2D &aOutBBox ,
-                            float aBiuTo3DunitsScale )
-{
-    aOutBBox.Reset();
-
-    for( int idx = 0; idx < aPolysList.OutlineCount(); ++idx )
-    {
-        // Each polygon in aPolysList is a polygon with holes
-        const SHAPE_POLY_SET::POLYGON& curr_polywithholes = aPolysList.CPolygon( idx );
-
-        for( unsigned ipoly = 0; ipoly < curr_polywithholes.size(); ++ipoly )
-        {
-            const SHAPE_LINE_CHAIN& path = curr_polywithholes[ipoly]; // a simple polygon
-
-             for( int jj = 0; jj < path.PointCount(); jj++ )
-             {
-                 const VECTOR2I& a = path.CPoint( jj );
-
-                 aOutBBox.Union( SFVEC2F( (float) a.x * aBiuTo3DunitsScale,
-                                          (float)-a.y * aBiuTo3DunitsScale ) );
-             }
-        }
-    }
-
-    aOutBBox.ScaleNextUp();
-}
-
-
 #ifdef DEBUG
 static void polygon_Convert( const ClipperLib::Path &aPath,
                             SEGMENTS &aOutSegment,
@@ -148,11 +148,8 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
        CGENERICCONTAINER2D &aDstContainer,
        float aBiuTo3DunitsScale,
        float aDivFactor,
-        const BOARD_ITEM &aBoardItem );
-
-void Polygon_Calc_BBox_3DU( const SHAPE_POLY_SET &aPolysList,
-                            CBBOX2D &aOutBBox,
-                            float aBiuTo3DunitsScale );
+        const BOARD_ITEM &aBoardItem,
+        int aPolyIndex );

 void Polygon2d_TestModule();

@@ -85,7 +85,7 @@ public:
    bool IsPointInside( const SFVEC2F &aPoint ) const override;
 };

-static const float s_min_dot = (FLT_EPSILON * 4.0f) ;
+static const float s_min_dot = (FLT_EPSILON * 4.0f * FLT_EPSILON * 4.0f) ;

 /**
 * @brief Segment_is_a_circle - check if segment start and end is very close to each other
@@ -31,6 +31,17 @@
 #include <wx/log.h>


+// A helper function to normalize aAngle between -2PI and +2PI
+inline void normalise2PI( float& aAngle )
+{
+    while( aAngle > 0.0 )
+        aAngle -= M_PI*2;
+
+    while( aAngle < 0.0 )
+        aAngle += M_PI*2;
+}
+
+
 /**
 *  Trace mask used to enable or disable the trace output of this class.
 *  The debug output can be turned on by setting the WXTRACE environment variable to
@@ -95,6 +106,20 @@ void CCAMERA::Reset_T1()
    m_zoom_t1              = 1.0f;
    m_rotate_aux_t1        = SFVEC3F( 0.0f );
    m_lookat_pos_t1        = m_board_lookat_pos_init;
+
+
+    // Since 0 = 2pi, we want to reset the angle to be the closest
+    // one to where we currently are. That ensures that we rotate
+    // the board around the smallest distance getting there.
+    if( m_rotate_aux_t0.x > M_PI )
+        m_rotate_aux_t1.x = 2*M_PI;
+
+    if( m_rotate_aux_t0.y > M_PI )
+        m_rotate_aux_t1.y = 2*M_PI;
+
+    if( m_rotate_aux_t0.z > M_PI )
+        m_rotate_aux_t1.z = 2*M_PI;
+
 }


@@ -111,14 +136,17 @@ void CCAMERA::updateRotationMatrix()
    m_rotationMatrixAux = glm::rotate( glm::mat4( 1.0f ),
                                       m_rotate_aux.x,
                                       SFVEC3F( 1.0f, 0.0f, 0.0f ) );
+    normalise2PI( m_rotate_aux.x );

    m_rotationMatrixAux = glm::rotate( m_rotationMatrixAux,
                                       m_rotate_aux.y,
                                       SFVEC3F( 0.0f, 1.0f, 0.0f ) );
+    normalise2PI( m_rotate_aux.y );

    m_rotationMatrixAux = glm::rotate( m_rotationMatrixAux,
                                       m_rotate_aux.z,
                                       SFVEC3F( 0.0f, 0.0f, 1.0f ) );
+    normalise2PI( m_rotate_aux.z );

    m_parametersChanged = true;

@@ -163,7 +191,7 @@ void CCAMERA::rebuildProjection()

        m_projectionMatrixInv = glm::inverse( m_projectionMatrix );

-        m_frustum.tang = glm::tan( glm::radians( m_frustum.angle ) * 0.5f ) ;
+        m_frustum.tang = glm::tan( glm::radians( m_frustum.angle ) * 0.5f );

        m_focalLen.x = ( (float)m_windowSize.y / (float)m_windowSize.x ) / m_frustum.tang;
        m_focalLen.y = 1.0f / m_frustum.tang;
@@ -178,19 +206,21 @@ void CCAMERA::rebuildProjection()

        m_frustum.nearD = -m_frustum.farD; // Use a symmetrical clip plane for ortho projection

-        const float orthoReductionFactor = m_zoom / 75.0f;
+        // This formula was found by trial and error
+        const float orthoReductionFactor = glm::length( m_camera_pos_init ) *
+                                           m_zoom * m_zoom * 0.5f;

        // Initialize Projection Matrix for Ortographic View
-        m_projectionMatrix = glm::ortho( -m_windowSize.x * orthoReductionFactor,
-                                          m_windowSize.x * orthoReductionFactor,
-                                         -m_windowSize.y * orthoReductionFactor,
-                                          m_windowSize.y * orthoReductionFactor,
+        m_projectionMatrix = glm::ortho( -m_frustum.ratio * orthoReductionFactor,
+                                          m_frustum.ratio * orthoReductionFactor,
+                                         -orthoReductionFactor,
+                                          orthoReductionFactor,
                                          m_frustum.nearD, m_frustum.farD );

        m_projectionMatrixInv = glm::inverse( m_projectionMatrix );

-        m_frustum.nw = m_windowSize.x * orthoReductionFactor * 2.0f;
-        m_frustum.nh = m_windowSize.y * orthoReductionFactor * 2.0f;
+        m_frustum.nw = orthoReductionFactor * 2.0f * m_frustum.ratio;
+        m_frustum.nh = orthoReductionFactor * 2.0f;
        m_frustum.fw = m_frustum.nw;
        m_frustum.fh = m_frustum.nh;

@@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -22,11 +22,12 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-/**
- * @file  eda_3d_viewer.cpp
- * @brief Implements a 3d viewer windows GUI
- */
-
+#include <wx/colordlg.h>
+#include <wx/colour.h>
+#include <wx/filename.h>
+#include <wx/string.h>
+#include <wx/wupdlock.h>
+#include <wx/clipbrd.h>
 #include "eda_3d_viewer.h"

 #include "../3d_viewer_id.h"
@@ -271,6 +272,7 @@ void EDA_3D_VIEWER::OnCloseWindow( wxCloseEvent &event )
    event.Skip( true );
 }

+
 #define ROT_ANGLE 10.0

 void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
@@ -292,7 +294,7 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
        break;

    case ID_ROTATE3D_X_POS:
-        m_settings.CameraGet().RotateX( glm::radians(ROT_ANGLE) );
+        m_settings.CameraGet().RotateX( glm::radians( ROT_ANGLE ) );

        if( m_settings.RenderEngineGet() == RENDER_ENGINE_OPENGL_LEGACY )
            m_canvas->Request_refresh();
@@ -302,7 +304,7 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
        break;

    case ID_ROTATE3D_X_NEG:
-        m_settings.CameraGet().RotateX( -glm::radians(ROT_ANGLE) );
+        m_settings.CameraGet().RotateX( -glm::radians( ROT_ANGLE ) );

        if( m_settings.RenderEngineGet() == RENDER_ENGINE_OPENGL_LEGACY )
            m_canvas->Request_refresh();
@@ -369,7 +371,11 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )

    case ID_ORTHO:
        m_settings.CameraGet().ToggleProjection();
-        m_canvas->Request_refresh();
+
+        if( m_settings.RenderEngineGet() == RENDER_ENGINE_OPENGL_LEGACY )
+            m_canvas->Request_refresh();
+        else
+            m_canvas->RenderRaytracingRequest();
        return;

    case ID_TOOL_SCREENCOPY_TOCLIBBOARD:
@@ -761,7 +767,7 @@ void EDA_3D_VIEWER::LoadSettings( wxConfigBase *aCfg )
    aCfg->Read( keyRenderRAY_Shadows, &tmp, true );
    m_settings.SetFlag( FL_RENDER_RAYTRACING_SHADOWS, tmp );

-    aCfg->Read( keyRenderRAY_Backfloor, &tmp, true );
+    aCfg->Read( keyRenderRAY_Backfloor, &tmp, false );
    m_settings.SetFlag( FL_RENDER_RAYTRACING_BACKFLOOR, tmp );

    aCfg->Read( keyRenderRAY_Refractions, &tmp, true );
@@ -985,6 +991,17 @@ void EDA_3D_VIEWER::takeScreenshot( wxCommandEvent& event )

        fullFileName = m_defaultSaveScreenshotFileName.GetFullPath();

+        wxFileName fn = fullFileName;
+
+        if( !fn.IsDirWritable() )
+        {
+            wxString msg;
+
+            msg.Printf( _( "Insufficient permissions required to save file\n%s" ), fullFileName );
+            wxMessageBox( msg, _( "Error" ), wxOK | wxICON_ERROR, this );
+            return;
+        }
+
        // Be sure the screen area destroyed by the file dialog is redrawn
        // before making a screen copy.
        // Without this call, under Linux the screen refresh is made to late.
@@ -103,6 +103,8 @@ enum id_3dview_frm

    ID_DISABLE_RAY_TRACING,

+    ID_CUSTOM_EVENT_1,      // A id for a custom event (canvas refresh request)
+
    ID_POPUP_3D_VIEW_START,
    ID_POPUP_ZOOMIN,
    ID_POPUP_ZOOMOUT,
@@ -46,9 +46,10 @@ Russell Oliver <roliver8143[at]gmail-dot-com>
 Seth Hillbrand <hillbrand[at]ucdavis-dot-edu>
 Jeff Young <jeff[at]rokeby-dot-ie>
 Kevin Cozens <kevin[at]ve3syb-dot-ca>
+Ian McInerney <ian.s.mcinerney[at]ieee-dot-org>

-See git repo on launchpad for contributors at
-https://code.launchpad.net/~kicad-product-committers/kicad/+git/product-git/+ref/master.
+See git repo on GitLab for contributors at
+https://gitlab.com/kicad/code/kicad/-/graphs/master


 == Document Writers
@@ -75,6 +76,7 @@ Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
 Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
 German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
 Japanese (JA) Kenta Yonekura <yoneken[at]kicad-dot-jp>
+Simplified Chinese (zh_CN) taotieren <admin[at]taotieren-dot-com>

 Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke

@@ -21,14 +21,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #

-cmake_minimum_required( VERSION 2.8.12 FATAL_ERROR )
-# because of http://public.kitware.com/Bug/view.php?id=10395
-
-# See https://gitlab.kitware.com/cmake/cmake/issues/15943
-# Remove as soon as 3.1 is minimum required version
-if(POLICY CMP0025)
-  cmake_policy(SET CMP0025 NEW) # CMake 3.0
-endif()
+cmake_minimum_required( VERSION 3.2 FATAL_ERROR )

 # Default to CMAKE_BUILD_TYPE = Release unless overridden on command line
 # http://www.cmake.org/pipermail/cmake/2008-September/023808.html
@@ -200,24 +193,6 @@ include( PerformFeatureChecks )
 perform_feature_checks()


-# Workaround: CMake < 3.1 does not support CMAKE_CXX_STANDARD
-if( NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1 )
-    message( FATAL_ERROR "Remove compatibility code" )
-endif()
-
-if( CMAKE_VERSION VERSION_LESS 3.1 AND ( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) )
-    include(CheckCXXCompilerFlag)
-
-    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-
-    if(COMPILER_SUPPORTS_CXX11)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    else()
-        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-    endif()
-endif()
-
-
 # Warn about missing override specifiers, if supported
 if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
    include(CheckCXXCompilerFlag)
@@ -413,7 +388,7 @@ endif()
 if( KICAD_USE_OCC )
    add_definitions( -DKICAD_USE_OCC )
    remove_definitions( -DKICAD_USE_OCE )
-    unset( KICAD_USE_OCE )
+    unset( KICAD_USE_OCE CACHE )
 endif()

 if( KICAD_USE_CUSTOM_PADS )
@@ -894,6 +869,16 @@ add_custom_target( uninstall
    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" )


+#################################################
+# Generate platform metadata files
+#################################################
+if( APPLE )
+    include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_macos.cmake )
+elseif( UNIX )
+    include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_linux.cmake )
+endif()
+
+
 #================================================
 # Installation
 #================================================
@@ -919,7 +904,7 @@ if( UNIX AND NOT APPLE )
    set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
    set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
    set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
-    set( UNIX_APPDATA_FILES resources/linux/appdata )
+    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/appdata )

    # Install Mime directory
    install( DIRECTORY ${UNIX_ICON_FILES}
@@ -943,6 +928,9 @@ if( UNIX AND NOT APPLE )
    install( DIRECTORY ${UNIX_APPDATA_FILES}
        DESTINATION share
        COMPONENT resources
+        FILES_MATCHING
+        PATTERN "*appdata.xml"
+        PATTERN "*.in" EXCLUDE
        )
 endif()

@@ -988,7 +976,10 @@ add_subdirectory( plugins )             # 3D plugins must be built before kicad
 add_subdirectory( kicad )               # should follow pcbnew, eeschema
 add_subdirectory( tools )
 add_subdirectory( utils )
-add_subdirectory( qa )
+
+if( KICAD_BUILD_QA_TESTS )
+    add_subdirectory( qa )
+endif()

 # Resources
 if ( KICAD_INSTALL_DEMOS )
@@ -27,6 +27,8 @@ macro( create_git_version_header _git_src_path )
    find_package( Git )

    if( GIT_FOUND )
+        message( STATUS "Using Git to determine build version string." )
+
        set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" )
        set( ENV{LC_ALL} C )

@@ -44,7 +44,7 @@ cmake_find_frameworks(Python)

 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)

 if(PythonLibs_FIND_VERSION)
    if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
@@ -55,7 +55,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig)
+find_program(SWIG_EXECUTABLE NAMES swig4.0 swig3.0 swig2.0 swig)

 if(SWIG_EXECUTABLE)
  execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib
@@ -1,6 +1,8 @@
 # CMake script for finding libngspice

 # Copyright (C) 2016 CERN
+# Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors.
+#
 # Author: Maciej Suminski <maciej.suminski@cern.ch>
 #
 # This program is free software; you can redistribute it and/or
@@ -20,21 +22,103 @@
 # or you may write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

+# Usage:
+#
+# ngspice uses pkg-config to gather the configuration information so the pkg-config
+# information is used to populate the CMake find_* commands.  When pkg-config is not
+# available, the fallback is the default platform search paths set up by CMake.  The
+# default search paths can be overridden by user.  The order of precedence is as
+# follows:
+#
+# User defined root path NGSPICE_ROOT_DIR on CMake command line.
+# User defined root path environment variable NGSPICE_ROOT_DIR.
+# Paths generated by pkg-config.
+# The default system paths configured by CMake
+#
+# For a specific ngspice include path not defined above set NGSPICE_INCLUDE_PATH.
+#
+# For a specific ngspice library path not defined above set NGSPICE_LIBRARY_PATH.
+
+# Use pkg-config if it's available.
+find_package(PkgConfig)
+
+if( PKG_CONFIG_FOUND )
+    pkg_check_modules( _NGSPICE ngspice )
+
+    if( _NGSPICE_FOUND )
+        set( NGSPICE_BUILD_VERSION "${_NGSPICE_VERSION}" CACHE STRING
+             "ngspice version returned by pkg-config" )
+    endif()
+endif()
+
+
 find_path( NGSPICE_INCLUDE_DIR ngspice/sharedspice.h
-    PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_INCLUDE_PATH}
-          ${NGSPICE_ROOT_DIR}/include
-    PATH_SUFFIXES src/include share/ngspice/include share/ngspice/include/ngspice
+    PATHS
+        ${NGSPICE_ROOT_DIR}
+        $ENV{NGSPICE_ROOT_DIR}
+        ${NGSPICE_INCLUDE_PATH}
+        ${_NGSPICE_INCLUDE_DIRS}
+    PATH_SUFFIXES
+        include
+        src/include
+        share/ngspice/include
+        share/ngspice/include/ngspice
 )

 find_library( NGSPICE_LIBRARY ngspice
-    PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_LIBRARY_PATH}
-    PATH_SUFFIXES src/.libs lib
+    PATHS
+        ${NGSPICE_ROOT_DIR}
+        $ENV{NGSPICE_ROOT_DIR}
+        ${NGSPICE_LIBRARY_PATH}
+        ${_NGSPICE_LIBRARY_DIRS}
+    PATH_SUFFIXES
+        src/.libs
+        lib
 )

+# If the ngspice version is not set by pkg-config, see if ngspice/config.h is available.
+if( NOT NGSPICE_BUILD_VERSION )
+    find_file( NGSPICE_CONFIG_H ngspice/config.h
+        PATHS
+            ${NGSPICE_ROOT_DIR}
+            $ENV{NGSPICE_ROOT_DIR}
+            ${NGSPICE_INCLUDE_PATH}
+            ${_NGSPICE_INCLUDE_DIRS}
+        PATH_SUFFIXES
+            include
+            src/include
+            share/ngspice/include
+            share/ngspice/include/ngspice
+        )
+
+    if( NOT NGSPICE_CONFIG_H-NOTFOUND )
+        message( STATUS "ngspice configuration file ${NGSPICE_CONFIG_H} found." )
+        set( NGSPICE_HAVE_CONFIG_H "1" CACHE STRING "ngspice/config.h header found." )
+    endif()
+endif()
+
 if( WIN32 AND MSYS )
    # NGSPICE_LIBRARY points to libngspice.dll.a on Windows,
    # but the goal is to find out the DLL name.
    find_library( NGSPICE_DLL NAMES libngspice-0.dll libngspice-1.dll )
+
+    # Some msys versions do not find xxx.dll lib files, only xxx.dll.a files
+    # so try a find_file in exec paths
+    if( NGSPICE_DLL STREQUAL "NGSPICE_DLL-NOTFOUND" )
+        find_file( NGSPICE_DLL NAMES libngspice-0.dll libngspice-1.dll
+            PATHS
+                ${NGSPICE_ROOT_DIR}
+            PATH_SUFFIXES
+                bin
+                lib
+            )
+    endif()
+
+    if( NGSPICE_DLL STREQUAL "NGSPICE_DLL-NOTFOUND" )
+        message( ERROR ":\n***** libngspice-x.dll not found in any executable path *****\n\n" )
+    else()
+        message( STATUS ": libngspice shared lib found: ${NGSPICE_DLL}\n" )
+    endif()
 else()
    set( NGSPICE_DLL "${NGSPICE_LIBRARY}" )
 endif()
@@ -62,4 +146,6 @@ mark_as_advanced(
    NGSPICE_INCLUDE_DIR
    NGSPICE_LIBRARY
    NGSPICE_DLL
+    NGSPICE_BUILD_VERSION
+    NGSPIC_HAVE_CONFIG_H
 )
@@ -0,0 +1,40 @@
+#
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
+#  Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+# This file will create the full KiCad version string. The base of this string
+# will be either the git tag followed by the commit hash (if built inside a git
+# repository), or the version from KiCadVersion.cmake. The user-provided
+# KICAD_VERSION_EXTRA is then appended to the base version string.
+
+# Use git to determine the version string if it's available.
+include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
+create_git_version_header( ${SRC_PATH} )
+
+# $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
+set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
+
+# Optional user version information defined at configuration.
+if( KICAD_VERSION_EXTRA )
+    set( KICAD_VERSION_FULL "${KICAD_VERSION_FULL}-${KICAD_VERSION_EXTRA}" )
+endif()
@@ -35,4 +35,4 @@
 # be set after each version tag is added to the git repo.  This will
 # give developers a reasonable idea where which branch was used to build
 # KiCad.
-set( KICAD_VERSION "5.1.3" )
+set( KICAD_VERSION "5.1.7" )
@@ -0,0 +1,46 @@
+#
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
+#  Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+# This file will configure the linux appdata.xml file to include the version
+# and build date.
+
+message( STATUS "Creating linux metadata" )
+
+# Create the KiCad version strings
+set( SRC_PATH ${PROJECT_SOURCE_DIR} )
+include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+
+# Create the date of the configure
+string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
+
+# Configure the KiCad appdata file
+configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in
+                ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml
+                @ONLY )
+
+# Ensure the file was configured successfully
+if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml )
+    message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." )
+endif()
@@ -0,0 +1,63 @@
+#
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
+#  Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+# This file will configure the MacOS info.plist files to include the version
+# and build date.
+
+message( STATUS "Creating MacOS metadata" )
+
+# Create the KiCad version strings
+set( SRC_PATH ${PROJECT_SOURCE_DIR} )
+include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+
+
+# Configure each plist file from the respurces directory and store it in the build directory
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/bitmap2component.Info.plist.in
+                ${PROJECT_BINARY_DIR}/bitmap2component/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/eeschema.Info.plist.in
+                ${PROJECT_BINARY_DIR}/eeschema/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/gerbview.Info.plist.in
+                ${PROJECT_BINARY_DIR}/gerbview/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/kicad.Info.plist.in
+                ${PROJECT_BINARY_DIR}/kicad/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/pcb_calculator.Info.plist.in
+                ${PROJECT_BINARY_DIR}/pcb_calculator/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/pcbnew.Info.plist.in
+                ${PROJECT_BINARY_DIR}/pcbnew/Info.plist
+                @ONLY )
+
+configure_file( ${PROJECT_SOURCE_DIR}/resources/macos/plist/pleditor.Info.plist.in
+                ${PROJECT_BINARY_DIR}/pagelayout_editor/Info.plist
+                @ONLY )
@@ -22,25 +22,9 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #

-# Automagically create version header file if the version string was
-# not defined during the build configuration.  If CreateGitVersionHeader
-# cannot determine the current repo version, a version.h file is still
-# created with KICAD_VERSION set in KiCadVersion.cmake.
+# Create the KiCad version strings
 include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-
-# Always use git if it's available to determine the version string.
-message( STATUS "Using Git to determine build version string." )
-include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
-create_git_version_header( ${SRC_PATH} )
-
-# $KICAD_VERSION will always be set to something.  Even if it is the default
-# value set in KiCadVersion.cmake
-set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
-
-# Optional user version information defined at configuration.
-if( KICAD_VERSION_EXTRA )
-    set( KICAD_VERSION_FULL "${KICAD_VERSION_FULL}-${KICAD_VERSION_EXTRA}" )
-endif()
+include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )

 set( _wvh_new_version_text
 "/* Do not modify this file, it was automatically generated by CMake. */
@@ -75,4 +75,10 @@
 /// Allows scripts install directory to be referenced by the program code.
 #define PYTHON_DEST                     "@PYTHON_DEST@"

+/// ngspice version string detected by pkg-config when available.
+#cmakedefine NGSPICE_BUILD_VERSION           "@NGSPICE_BUILD_VERSION@"
+
+/// When pkg-config config is not available for ngspice, use ngspice/config.h for version.
+#cmakedefine NGSPICE_HAVE_CONFIG_H
+
 #endif  // CONFIG_H_
@@ -222,7 +222,7 @@ and can cause Pcbnew to crash if Python scripts create an invalid object state w

 The KiCad version string is defined by the output of `git describe --dirty` when git is available
 or the version string defined in CMakeModules/KiCadVersion.cmake with the value of
-KICAD_VERSION_EXTRA appended to the former.  If the KICAD_VERSION_EXTRA variable is not define,
+KICAD_VERSION_EXTRA appended to the former.  If the KICAD_VERSION_EXTRA variable is not defined,
 it is not appended to the version string.  If the KICAD_VERSION_EXTRA  variable is defined it
 is appended along with a leading '-' to the full version string as follows:

@@ -54,11 +54,8 @@ target_link_libraries( bitmap2component
    )

 if( APPLE )
-    include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist @ONLY )
-
    set_target_properties( bitmap2component PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
+        MACOSX_BUNDLE_INFO_PLIST ${PROJECT_BINARY_DIR}/bitmap2component/Info.plist
        )

    # put individual bundle outside of main bundle as a first step
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDocumentTypes</key>
-	<array/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>bitmap2component</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string>bitmap2component.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.kicad-pcb.bitmap2component</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-    <string>@KICAD_VERSION_FULL@</string>
-	<key>CFBundleName</key>
-	<string>Bitmap 2 Component</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@KICAD_VERSION@</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>@KICAD_VERSION_FULL@</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-        <key>NSHighResolutionCapable</key>
-        <string>True</string>
-</dict>
-</plist>
@@ -8,14 +8,20 @@
 static const unsigned char png[] = {
 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
- 0x61, 0x00, 0x00, 0x00, 0x60, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x90, 0x92, 0x92, 0xfa,
- 0x0f, 0xc2, 0x0c, 0xe4, 0x02, 0xaa, 0x19, 0x20, 0x2e, 0x2e, 0x2e, 0x46, 0x91, 0x01, 0xd2, 0xd2,
- 0xd2, 0x97, 0xc9, 0x32, 0x04, 0x66, 0x00, 0x14, 0x5f, 0x97, 0x97, 0x97, 0x97, 0x24, 0xd7, 0x80,
- 0x4b, 0x64, 0x19, 0x02, 0x33, 0x40, 0x42, 0x42, 0x42, 0x94, 0x2c, 0x43, 0x90, 0x63, 0x01, 0x14,
- 0x06, 0xa0, 0xb0, 0x40, 0xf3, 0x16, 0x5e, 0x4c, 0x3d, 0x03, 0xd0, 0xbd, 0x20, 0x2a, 0x2a, 0x2a,
- 0x41, 0x76, 0x20, 0x12, 0xad, 0x19, 0x5b, 0x34, 0x92, 0xa4, 0x99, 0xaa, 0x09, 0x89, 0xe2, 0xa4,
- 0x3c, 0x60, 0xb9, 0x11, 0x00, 0xd8, 0xbd, 0x63, 0x3e, 0x86, 0xe5, 0x97, 0x0f, 0x00, 0x00, 0x00,
- 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0x61, 0x00, 0x00, 0x00, 0xb9, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x40, 0x03, 0x52,
+ 0x52, 0x52, 0xff, 0x41, 0x98, 0x01, 0x0b, 0x10, 0x11, 0x11, 0xe1, 0x95, 0x94, 0x94, 0xdc, 0xca,
+ 0x80, 0x0f, 0xe0, 0x32, 0x40, 0x5a, 0x5a, 0x5a, 0x06, 0x28, 0x7e, 0x1e, 0x97, 0xe1, 0x70, 0x1b,
+ 0xb0, 0x19, 0x20, 0x23, 0x23, 0x63, 0x06, 0x14, 0x7b, 0x81, 0xcf, 0x75, 0x20, 0xc0, 0x08, 0xb4,
+ 0x65, 0x2d, 0xba, 0x22, 0xa0, 0x93, 0x83, 0x80, 0xfc, 0xaf, 0x30, 0x71, 0x9c, 0x06, 0x00, 0x35,
+ 0xd7, 0xa0, 0x2b, 0x02, 0xd2, 0x65, 0x40, 0xfc, 0x17, 0x2a, 0x36, 0x0b, 0xa7, 0x01, 0x40, 0x41,
+ 0x37, 0x20, 0xfe, 0x83, 0xa4, 0x18, 0x84, 0xa7, 0x42, 0xe9, 0x7f, 0x40, 0xdc, 0x80, 0x33, 0x7c,
+ 0x80, 0xfe, 0x53, 0x05, 0x0a, 0xbe, 0x07, 0x49, 0x00, 0x9d, 0x5b, 0x85, 0xec, 0x0a, 0x20, 0xfe,
+ 0x0e, 0xc4, 0x11, 0x78, 0x03, 0x18, 0x28, 0x70, 0x05, 0x24, 0x08, 0xf2, 0x3f, 0x28, 0x1c, 0xd0,
+ 0x0c, 0x20, 0x88, 0x29, 0x37, 0x40, 0x5c, 0x5c, 0x5c, 0x11, 0xc8, 0x78, 0x03, 0x35, 0xa4, 0x9a,
+ 0x50, 0x54, 0xe1, 0x4a, 0x3c, 0xae, 0xe8, 0x81, 0xc8, 0x40, 0x2a, 0x40, 0xb6, 0x9d, 0x2c, 0x03,
+ 0x70, 0x25, 0x24, 0x92, 0x00, 0xae, 0xa4, 0x4c, 0x6a, 0x78, 0xd0, 0xd7, 0x00, 0x00, 0xe0, 0x1c,
+ 0x80, 0xeb, 0x37, 0x41, 0x6c, 0xd9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
 };

 const BITMAP_OPAQUE pinshape_clock_fall_xpm[1] = {{ png, sizeof( png ), "pinshape_clock_fall_xpm" }};
@@ -11,7 +11,7 @@
   width="16"
   version="1.1"
   id="svg2"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.92.0 r15299"
   sodipodi:docname="pinshape_clock_active_low.svg">
  <metadata
     id="metadata22">
@@ -21,8 +21,23 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/4.0/" />
      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
    </rdf:RDF>
  </metadata>
  <defs
@@ -36,15 +51,15 @@
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="744"
+     inkscape:window-width="1920"
+     inkscape:window-height="1033"
     id="namedview18"
     showgrid="true"
     inkscape:zoom="24.969708"
     inkscape:cx="4.4578733"
     inkscape:cy="9.2981956"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg2">
    <inkscape:grid
@@ -11,8 +11,8 @@
   width="16"
   version="1.1"
   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="pinshape_clock_fall.svg">
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="pinshape_clock_active_low.svg">
  <metadata
     id="metadata22">
    <rdf:RDF>
@@ -21,8 +21,23 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/4.0/" />
      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
    </rdf:RDF>
  </metadata>
  <defs
@@ -36,15 +51,15 @@
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="744"
+     inkscape:window-width="1920"
+     inkscape:window-height="1033"
     id="namedview18"
     showgrid="true"
     inkscape:zoom="24.969708"
     inkscape:cx="4.4578733"
     inkscape:cy="9.2981956"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg2">
    <inkscape:grid
@@ -56,19 +71,25 @@
       snapvisiblegridlinesonly="true" />
  </sodipodi:namedview>
  <path
-     d="M 1,0 1,16"
+     d="M 5,0 5,16"
     id="path12"
     inkscape:connector-curvature="0"
     style="fill:none;stroke:#1a1a1a;stroke-width:2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none"
     sodipodi:nodetypes="cc" />
  <path
-     d="M 6,8 16,8"
+     d="M 5,8 16,8"
     id="path14"
     inkscape:connector-curvature="0"
     style="fill:none;stroke:#1a1a1a;stroke-width:2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none"
     sodipodi:nodetypes="cc" />
  <path
-     d="M 1,13 6,8 1,3"
+     sodipodi:nodetypes="ccc"
+     style="fill:none;stroke:#1a1a1a;stroke-width:2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path4010"
+     d="m 5,8 7,-6 0,6" />
+  <path
+     d="M 5,13 1,8 5,3"
     id="path4094"
     inkscape:connector-curvature="0"
     style="fill:none;stroke:#1a1a1a;stroke-width:2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none"
@@ -11,8 +11,8 @@
   width="16"
   version="1.1"
   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="pinshape_clock_normal.svg">
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="pinshape_clock_invert.svg">
  <metadata
     id="metadata22">
    <rdf:RDF>
@@ -22,7 +22,22 @@
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/4.0/" />
      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
    </rdf:RDF>
  </metadata>
  <defs
@@ -36,15 +51,15 @@
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="744"
+     inkscape:window-width="1920"
+     inkscape:window-height="1033"
     id="namedview18"
     showgrid="true"
     inkscape:zoom="24.969708"
     inkscape:cx="18.434809"
     inkscape:cy="9.4183412"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg2">
    <inkscape:grid
@@ -153,10 +153,10 @@ install( TARGETS lib_kicad
 endif()


-# KiCad build version string defaults to "no-vcs-found" which forces the build version header
-# command to look for git to create the version string header when the .git path is found in
-# the source path.
-set( KICAD_BRANCH_NAME "" CACHE STRING "KiCad repository name." )
+# The build version string defaults to the value in the KiCadVersion.cmake file.
+# If being built inside a git repository, the git tag and commit hash are used to create
+# a new version string instead. The user can supply an additional string to be appended
+# to the end inside the KICAD_VERSION_EXTRA variable
 set( KICAD_VERSION_EXTRA "" CACHE STRING
    "User defined configuration string to append to KiCad version." )

@@ -164,14 +164,13 @@ set( KICAD_VERSION_EXTRA "" CACHE STRING
 add_custom_target(
    version_header ALL
    COMMAND ${CMAKE_COMMAND}
-        -DKICAD_VERSION=${KICAD_VERSION}
-        -DKICAD_BRANCH_NAME=${KICAD_BRANCH_NAME}
        -DKICAD_VERSION_EXTRA=${KICAD_VERSION_EXTRA}
        -DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h
        -DSRC_PATH=${PROJECT_SOURCE_DIR}
        -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
        -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    BYPRODUCTS ${CMAKE_BINARY_DIR}/kicad_build_version.h
    COMMENT "Generating version string header"
    )

@@ -278,6 +277,7 @@ set( COMMON_SRCS
    ${PLOTTERS_CONTROL_SRCS}
    advanced_config.cpp
    array_options.cpp
+    base64.cpp
    base_struct.cpp
    bezier_curves.cpp
    bin_mod.cpp
@@ -380,6 +380,14 @@ if( BUILD_GITHUB_PLUGIN )
    )
 endif()

+# Link-time optimization (LTO) on GCC conflicts with embedded assembly (__asm),
+# following GCC's recommendation to disable LTO per translation unit.
+if( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set_source_files_properties( system/libcontext.cpp PROPERTIES
+        COMPILE_FLAGS "-fno-lto"
+        )
+endif()
+
 set( COMMON_SRCS
    ${COMMON_SRCS}
    system/libcontext.cpp
@@ -0,0 +1,157 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * @author Seth Hillbrand <seth@kipro-pcb.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <base64.h>
+
+#include <cstdint>
+#include <cstddef>
+#include <limits>
+#include <vector>
+
+namespace {
+
+static const uint8_t ENCODE_BASE64[64] = {
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+    0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
+    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+    0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76,
+    0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33,
+    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F,
+};
+
+static const uint8_t E = -1;
+
+static const uint8_t DECODE_BASE64[128] = {
+/*  0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xA 0xB 0xC 0xD 0xE 0xF */
+     E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,
+     E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E,
+     E,  E,  E,  E,  E,  E,  E,  E,  E,  E,  E, 62,  E,  E,  E, 63,
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61,  E,  E,  E,  E,  E,  E,
+     E,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,  E,  E,  E,  E,  E,
+     E, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,  E,  E,  E,  E,  E,
+};
+
+} // namespace
+
+namespace base64
+{
+    size_t encode_length( size_t aInputLen )
+    {
+        return 4 * ( ( aInputLen + 2 ) / 3 ) + ( aInputLen + 2 ) % 3 - 2;
+    }
+
+
+    size_t decode_length( size_t aInputLen )
+    {
+        if( aInputLen % 4 == 1 )
+            return 0;
+        else
+            return 3 * ( ( aInputLen + 2 ) / 4 ) + ( aInputLen + 2 ) % 4 - 2;
+    }
+
+
+    void encode( const std::vector<uint8_t>& aInput, std::vector<uint8_t>& aOutput )
+    {
+        size_t end = ( aInput.size() / 3 ) * 3;
+        aOutput.reserve( encode_length( aInput.size() ) );
+
+        for( size_t i = 0; i < end; i += 3 )
+        {
+            unsigned value = ( aInput[i] << 16 ) | ( aInput[i + 1] << 8 ) | aInput[i + 2] ;
+
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 18 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 12 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 6 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[value & 0x3F] );
+        }
+
+        size_t remainder = aInput.size() - end;
+
+        if( remainder )
+        {
+            unsigned value = aInput[end];
+
+            if( remainder == 2 )
+            {
+                value = ( value << 10 ) | ( aInput[end + 1] << 2 );
+                aOutput.emplace_back( ENCODE_BASE64[( value >> 12 ) & 0x3F] );
+            }
+            else
+            {
+                value <<= 4;
+            }
+
+            aOutput.emplace_back( ENCODE_BASE64[( value >> 6 ) & 0x3F] );
+            aOutput.emplace_back( ENCODE_BASE64[value & 0x3F] );
+        }
+    }
+
+
+    void decode(const std::vector<uint8_t>& aInput, std::vector<uint8_t>& aOutput )
+    {
+        size_t end = ( aInput.size() / 4 ) * 4;
+        size_t decode_size = decode_length( aInput.size() );
+
+        if( !decode_size )
+            return;
+
+        aOutput.reserve( decode_size );
+
+        for( size_t i = 0; i < end; i++ )
+        {
+            unsigned value = ( DECODE_BASE64[aInput[i] & 0x7F] << 18 ) |
+                             ( DECODE_BASE64[aInput[i + 1] & 0x7F] << 12 ) |
+                             ( DECODE_BASE64[aInput[i + 2] & 0x7F] << 6 ) |
+                               DECODE_BASE64[aInput[i + 3] & 0x7F];
+
+            aOutput.emplace_back( ( value >> 16 ) & 0xff );
+            aOutput.emplace_back( ( value >> 8 ) & 0xff );
+            aOutput.emplace_back( value & 0xff );
+        }
+
+        size_t remainder = aInput.size() - end;
+
+        if( remainder )
+        {
+            unsigned value = ( ( DECODE_BASE64[aInput[end] & 0x7F] ) << 6 ) |
+                             ( DECODE_BASE64[aInput[end + 1] & 0x7F] );
+
+            if( remainder == 3 )
+            {
+                value = ( value << 6 ) | ( DECODE_BASE64[aInput[end + 2] & 0x7F] );
+                value >>= 2;
+
+                aOutput.emplace_back( ( value >> 8 ) & 0xff );
+            }
+            else
+            {
+                value >>= 4;
+            }
+            aOutput[0] = value & 0xff ;
+        }
+    }
+
+} // base64
@@ -405,6 +405,9 @@ bool EDA_RECT::Intersects( const wxPoint& aPoint1, const wxPoint& aPoint2 ) cons

 bool EDA_RECT::Intersects( const EDA_RECT& aRect ) const
 {
+    if( !m_init )
+        return false;
+
    // this logic taken from wxWidgets' geometry.cpp file:
    bool rc;
    EDA_RECT me(*this);
@@ -433,6 +436,9 @@ bool EDA_RECT::Intersects( const EDA_RECT& aRect ) const

 bool EDA_RECT::Intersects( const EDA_RECT& aRect, double aRot ) const
 {
+    if( !m_init )
+        return false;
+
    /* Most rectangles will be axis aligned.
     * It is quicker to check for this case and pass the rect
     * to the simpler intersection test
@@ -565,6 +571,9 @@ const wxPoint EDA_RECT::FarthestPointTo( const wxPoint& aPoint ) const

 bool EDA_RECT::IntersectsCircle( const wxPoint& aCenter, const int aRadius ) const
 {
+    if( !m_init )
+        return false;
+
    wxPoint closest = ClosestPointTo( aCenter );

    double dx = aCenter.x - closest.x;
@@ -578,6 +587,9 @@ bool EDA_RECT::IntersectsCircle( const wxPoint& aCenter, const int aRadius ) con

 bool EDA_RECT::IntersectsCircleEdge( const wxPoint& aCenter, const int aRadius, const int aWidth ) const
 {
+    if( !m_init )
+        return false;
+
    EDA_RECT me( *this );
    me.Normalize();         // ensure size is >= 0

@@ -675,6 +687,17 @@ EDA_RECT& EDA_RECT::Inflate( wxCoord dx, wxCoord dy )

 void EDA_RECT::Merge( const EDA_RECT& aRect )
 {
+    if( !m_init )
+    {
+        if( aRect.IsValid() )
+        {
+            m_Pos = aRect.GetPosition();
+            m_Size = aRect.GetSize();
+            m_init = true;
+        }
+        return;
+    }
+
    Normalize();        // ensure width and height >= 0
    EDA_RECT rect = aRect;
    rect.Normalize();   // ensure width and height >= 0
@@ -692,6 +715,13 @@ void EDA_RECT::Merge( const EDA_RECT& aRect )

 void EDA_RECT::Merge( const wxPoint& aPoint )
 {
+    if( !m_init )
+    {
+        m_Pos = aPoint;
+        m_Size = wxSize( 0, 0 );
+        return;
+    }
+
    Normalize();        // ensure width and height >= 0

    wxPoint  end = GetEnd();
@@ -1,8 +1,7 @@
 /*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
- * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014-2017 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -26,362 +25,69 @@
 /* routines to handle bezier curves */
 /************************************/

-#include <fctsys.h>
 #include <bezier_curves.h>

-
-static inline double calc_sq_distance( int x1, int y1, int x2, int y2 )
+BEZIER_POLY::BEZIER_POLY( const std::vector<wxPoint>& aControlPoints )
 {
-    int dx = x2 - x1;
-    int dy = y2 - y1;
+    for( unsigned ii = 0; ii < aControlPoints.size(); ++ii )
+        m_ctrlPts.emplace_back( VECTOR2D( aControlPoints[ii] ) );

-    return (double)dx * dx + (double)dy * dy;
-}
-
-
-static inline double sqrt_len( int dx, int dy )
-{
-    return ((double)dx * dx) + ((double)dy * dy);
+    m_minSegLen = 0.0;
 }


 void BEZIER_POLY::GetPoly( std::vector<wxPoint>& aOutput, int aMinSegLen )
 {
-    wxCHECK( !m_ctrlPts.empty(), /* void */ );
-    m_minSegLen = std::max( 1, aMinSegLen );
-    m_output = &aOutput;
-    m_output->clear();
-    m_output->push_back( wxPoint( m_ctrlPts.front() ) );
+    aOutput.clear();
+    std::vector<VECTOR2D> buffer;
+    GetPoly( buffer, double( aMinSegLen ) );

-    // Only quadratic and cubic Bezier curves are handled
-    if( m_ctrlPts.size() == 3 )
-        recursiveBezier( m_ctrlPts[0].x, m_ctrlPts[0].y,
-                m_ctrlPts[1].x, m_ctrlPts[1].y,
-                m_ctrlPts[2].x, m_ctrlPts[2].y, 0 );
-
-    else if( m_ctrlPts.size() == 4 )
-        recursiveBezier( m_ctrlPts[0].x, m_ctrlPts[0].y,
-                m_ctrlPts[1].x, m_ctrlPts[1].y,
-                m_ctrlPts[2].x, m_ctrlPts[2].y,
-                m_ctrlPts[3].x, m_ctrlPts[3].y, 0 );
-
-    m_output->push_back( wxPoint( m_ctrlPts.back() ) );
+    for( unsigned ii = 0; ii < buffer.size(); ++ii )
+        aOutput.emplace_back( wxPoint( int( buffer[ii].x ), int( buffer[ii].y ) ) );
 }


-void BEZIER_POLY::recursiveBezier( int x1, int y1, int x2, int y2,
-        int x3, int y3, unsigned int level )
+void BEZIER_POLY::GetPoly( std::vector<VECTOR2D>& aOutput, double aMinSegLen )
 {
-    if( level > recursion_limit )
-        return;
+    wxASSERT( m_ctrlPts.size() == 4 );
+    // FIXME Brute force method, use a better (recursive?) algorithm
+    // with a max error value.
+    // to optimize the number of segments
+    #define CURVE_POINTS 32
+    double dt = 1.0 / CURVE_POINTS;

-    // Calculate all the mid-points of the line segments
-    //----------------------
-    int    x12  = (x1 + x2) / 2;
-    int    y12  = (y1 + y2) / 2;
-    int    x23  = (x2 + x3) / 2;
-    int    y23  = (y2 + y3) / 2;
-    int    x123 = (x12 + x23) / 2;
-    int    y123 = (y12 + y23) / 2;
+    aOutput.clear();
+    aOutput.push_back( m_ctrlPts[0] );

-    int    dx = x3 - x1;
-    int    dy = y3 - y1;
-    double d  = fabs( ((double) (x2 - x3) * dy) - ((double) (y2 - y3) * dx ) );
-    double da;
+    // If the Bezier curve is degenerated (straight line), skip intermediate points:
+    bool degenerated = m_ctrlPts[0] == m_ctrlPts[1] && m_ctrlPts[2] == m_ctrlPts[3];

-    if( d > curve_collinearity_epsilon )
+    if( !degenerated )
    {
-        // Regular case
-        //-----------------
-        if( d * d <= distance_tolerance_square * (dx * dx + dy * dy) )
+        for( int ii = 1; ii < CURVE_POINTS; ii++ )
        {
-            // If the curvature doesn't exceed the distance_tolerance value
-            // we tend to finish subdivisions.
-            //----------------------
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x123, y123 ) );
-                return;
-            }
+            double t = dt * ii;
+            double omt  = 1.0 - t;
+            double omt2 = omt * omt;
+            double omt3 = omt * omt2;
+            double t2   = t * t;
+            double t3   = t * t2;

-            // Angle & Cusp Condition
-            //----------------------
-            da = fabs( atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) ) -
-                       atan2( (double) ( y2 - y1 ), (double) ( x2 - x1 ) ) );
-            if( da >=M_PI )
-                da = 2 * M_PI - da;
+            VECTOR2D vertex = omt3 * m_ctrlPts[0]
+                              + 3.0 * t * omt2 * m_ctrlPts[1]
+                              + 3.0 * t2 * omt * m_ctrlPts[2]
+                              + t3 * m_ctrlPts[3];

-            if( da < angle_tolerance )
-            {
-                // Finally we can stop the recursion
-                //----------------------
-                addSegment( wxPoint( x123, y123 ) );
-                return;
-            }
-        }
-    }
-    else
-    {
-        // Collinear case
-        //------------------
-        da = sqrt_len(dx, dy);
-        if( da == 0 )
-        {
-            d = calc_sq_distance( x1, y1, x2, y2 );
-        }
-        else
-        {
-            d = ( (double)(x2 - x1) * dx + (double)(y2 - y1) * dy ) / da;
-            if( d > 0 && d < 1 )
-            {
-                // Simple collinear case, 1---2---3
-                // We can leave just two endpoints
-                return;
-            }
-            if( d <= 0 )
-                d = calc_sq_distance( x2, y2, x1, y1 );
-            else if( d >= 1 )
-                d = calc_sq_distance( x2, y2, x3, y3 );
-            else
-                d = calc_sq_distance( x2, y2, x1 + (int) d * dx,
-                                      y1 + (int) d * dy );
-        }
-        if( d < distance_tolerance_square )
-        {
-            addSegment( wxPoint( x2, y2 ) );
-            return;
+            // a minimal filter on the lenght of the segment being created:
+            // The offset from last point:
+            VECTOR2D delta = vertex - aOutput.back();
+            double dist = delta.EuclideanNorm();
+
+            if( dist > aMinSegLen )
+                aOutput.push_back( vertex );
        }
    }

-    // Continue subdivision
-    //----------------------
-    recursiveBezier( x1, y1, x12, y12, x123, y123, level + 1 );
-    recursiveBezier( x123, y123, x23, y23, x3, y3, level + 1 );
-}
-
-
-void BEZIER_POLY::recursiveBezier( int x1, int y1, int x2, int y2,
-        int x3, int y3, int x4, int y4, unsigned int level )
-{
-    if( level > recursion_limit )
-        return;
-
-    // Calculate all the mid-points of the line segments
-    //----------------------
-    int x12   = (x1 + x2) / 2;
-    int y12   = (y1 + y2) / 2;
-    int x23   = (x2 + x3) / 2;
-    int y23   = (y2 + y3) / 2;
-    int x34   = (x3 + x4) / 2;
-    int y34   = (y3 + y4) / 2;
-    int x123  = (x12 + x23) / 2;
-    int y123  = (y12 + y23) / 2;
-    int x234  = (x23 + x34) / 2;
-    int y234  = (y23 + y34) / 2;
-    int x1234 = (x123 + x234) / 2;
-    int y1234 = (y123 + y234) / 2;
-
-
-    // Try to approximate the full cubic curve by a single straight line
-    //------------------
-    int    dx = x4 - x1;
-    int    dy = y4 - y1;
-
-    double d2 = fabs( (double) ( (x2 - x4) * dy - (y2 - y4) * dx ) );
-    double d3 = fabs( (double) ( (x3 - x4) * dy - (y3 - y4) * dx ) );
-    double da1, da2, k;
-
-    switch( (int(d2 > curve_collinearity_epsilon) << 1) +
-           int(d3 > curve_collinearity_epsilon) )
-    {
-    case 0:
-
-        // All collinear OR p1==p4
-        //----------------------
-        k = dx * dx + dy * dy;
-        if( k == 0 )
-        {
-            d2 = calc_sq_distance( x1, y1, x2, y2 );
-            d3 = calc_sq_distance( x4, y4, x3, y3 );
-        }
-        else
-        {
-            k   = 1 / k;
-            da1 = x2 - x1;
-            da2 = y2 - y1;
-            d2  = k * (da1 * dx + da2 * dy);
-            da1 = x3 - x1;
-            da2 = y3 - y1;
-            d3  = k * (da1 * dx + da2 * dy);
-            if( d2 > 0 && d2 < 1 && d3 > 0 && d3 < 1 )
-            {
-                // Simple collinear case, 1---2---3---4
-                // We can leave just two endpoints
-                return;
-            }
-            if( d2 <= 0 )
-                d2 = calc_sq_distance( x2, y2, x1, y1 );
-            else if( d2 >= 1 )
-                d2 = calc_sq_distance( x2, y2, x4, y4 );
-            else
-                d2 = calc_sq_distance( x2, y2, x1 + (int) d2 * dx,
-                                       y1 + (int) d2 * dy );
-
-            if( d3 <= 0 )
-                d3 = calc_sq_distance( x3, y3, x1, y1 );
-            else if( d3 >= 1 )
-                d3 = calc_sq_distance( x3, y3, x4, y4 );
-            else
-                d3 = calc_sq_distance( x3, y3, x1 + (int) d3 * dx,
-                                       y1 + (int) d3 * dy );
-        }
-        if( d2 > d3 )
-        {
-            if( d2 < distance_tolerance_square )
-            {
-                addSegment( wxPoint( x2, y2 ) );
-                return;
-            }
-        }
-        else
-        {
-            if( d3 < distance_tolerance_square )
-            {
-                addSegment( wxPoint( x3, y3 ) );
-                return;
-            }
-        }
-        break;
-
-    case 1:
-
-        // p1,p2,p4 are collinear, p3 is significant
-        //----------------------
-        if( d3 * d3 <= distance_tolerance_square * sqrt_len(dx, dy) )
-        {
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            // Angle Condition
-            //----------------------
-            da1 = fabs( atan2( (double) ( y4 - y3 ), (double) ( x4 - x3 ) ) -
-                        atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) ) );
-            if( da1 >= M_PI )
-                da1 = 2 * M_PI - da1;
-
-            if( da1 < angle_tolerance )
-            {
-                addSegment( wxPoint( x2, y2 ) );
-                addSegment( wxPoint( x3, y3 ) );
-                return;
-            }
-
-            if( cusp_limit != 0.0 )
-            {
-                if( da1 > cusp_limit )
-                {
-                    addSegment( wxPoint( x3, y3 ) );
-                    return;
-                }
-            }
-        }
-        break;
-
-    case 2:
-
-        // p1,p3,p4 are collinear, p2 is significant
-        //----------------------
-        if( d2 * d2 <= distance_tolerance_square * sqrt_len(dx, dy) )
-        {
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            // Angle Condition
-            //----------------------
-            da1 = fabs( atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) ) -
-                        atan2( (double) ( y2 - y1 ), (double) ( x2 - x1 ) ) );
-            if( da1 >= M_PI )
-                da1 = 2 * M_PI - da1;
-
-            if( da1 < angle_tolerance )
-            {
-                addSegment( wxPoint( x2, y2 ) );
-                addSegment( wxPoint( x3, y3 ) );
-                return;
-            }
-
-            if( cusp_limit != 0.0 )
-            {
-                if( da1 > cusp_limit )
-                {
-                    addSegment( wxPoint( x2, y2 ) );
-                    return;
-                }
-            }
-        }
-        break;
-
-    case 3:
-
-        // Regular case
-        //-----------------
-        if( (d2 + d3) * (d2 + d3) <= distance_tolerance_square * sqrt_len(dx, dy) )
-        {
-            // If the curvature doesn't exceed the distance_tolerance value
-            // we tend to finish subdivisions.
-            //----------------------
-            if( angle_tolerance < curve_angle_tolerance_epsilon )
-            {
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            // Angle & Cusp Condition
-            //----------------------
-            k   = atan2( (double) ( y3 - y2 ), (double) ( x3 - x2 ) );
-            da1 = fabs( k - atan2( (double) ( y2 - y1 ),
-                                   (double) ( x2 - x1 ) ) );
-            da2 = fabs( atan2( (double) ( y4 - y3 ),
-                               (double) ( x4 - x3 ) ) - k );
-            if( da1 >= M_PI )
-                da1 = 2 * M_PI - da1;
-            if( da2 >= M_PI )
-                da2 = 2 * M_PI - da2;
-
-            if( da1 + da2 < angle_tolerance )
-            {
-                // Finally we can stop the recursion
-                //----------------------
-                addSegment( wxPoint( x23, y23 ) );
-                return;
-            }
-
-            if( cusp_limit != 0.0 )
-            {
-                if( da1 > cusp_limit )
-                {
-                    addSegment( wxPoint( x2, y2 ) );
-                    return;
-                }
-
-                if( da2 > cusp_limit )
-                {
-                    addSegment( wxPoint( x3, y3 ) );
-                    return;
-                }
-            }
-        }
-        break;
-    }
-
-    // Continue subdivision
-    //----------------------
-    recursiveBezier( x1, y1, x12, y12, x123, y123, x1234, y1234, level + 1 );
-    recursiveBezier( x1234, y1234, x234, y234, x34, y34, x4, y4, level + 1 );
+    if( aOutput.back() != m_ctrlPts[3] )
+        aOutput.push_back( m_ctrlPts[3] );
 }
@@ -240,18 +240,23 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const wxPoint& aPos )
    aDC->SetLogicalOrigin( logicalOriginX / GetScalingFactor(),
                           logicalOriginY / GetScalingFactor() );

+    pos.x  = KiROUND( pos.x / GetScalingFactor() );
+    pos.y  = KiROUND( pos.y / GetScalingFactor() );
+    size.x = KiROUND( size.x / GetScalingFactor() );
+    size.y = KiROUND( size.y / GetScalingFactor() );
+    aDC->SetClippingRegion( pos, size );
+
    if( GetGRForceBlackPenState() )
    {
        wxBitmap result( m_bitmap->ConvertToImage().ConvertToGreyscale() );
-        aDC->DrawBitmap( result, KiROUND( pos.x / GetScalingFactor() ),
-                KiROUND( pos.y / GetScalingFactor() ), true );
+        aDC->DrawBitmap( result, pos.x, pos.y, true );
    }
    else
    {
-        aDC->DrawBitmap( *m_bitmap, KiROUND( pos.x / GetScalingFactor() ),
-                KiROUND( pos.y / GetScalingFactor() ), true );
+        aDC->DrawBitmap( *m_bitmap, pos.x, pos.y, true );
    }

+    aDC->DestroyClippingRegion();
    aDC->SetUserScale( scale, scale );
    aDC->SetLogicalOrigin( logicalOriginX, logicalOriginY );
 }
@@ -57,33 +57,46 @@ using KIGFX::COLOR4D;
 COLOR4D        g_GhostColor;


+// When reading/writing files, we need to swtich to setlocale( LC_NUMERIC, "C" ).
+// Works fine to read/write files with floating point numbers.
+// We can call setlocale( LC_NUMERIC, "C" ) of wxLocale( "C", "C", "C", false )
+// wxWidgets discourage a direct call to setlocale
+// However, for us, calling wxLocale( "C", "C", "C", false ) has a unwanted effect:
+// The I18N translations are no longer active, because the English dixtionary is selected.
+// To read files, this is not a major issues, but the resul can differ
+// from using setlocale(xx, "C").
+// Previouly, we called setlocale( LC_NUMERIC, "C" )
+// The old code will be removed when calling wxLocale( "C", "C", "C", false )
+// is fully tested, and all issues fixed
+#define USE_WXLOCALE 1      /* 0 to call setlocale, 1 to call wxLocale */
+
+// On Windows, when using setlocale, a wx alert is generated
+// in some cases (reading a bitmap for instance)
+// So we disable alerts during the time a file is read or written
+#if !USE_WXLOCALE
 #if defined( _WIN32 ) && defined( DEBUG )
 // a wxAssertHandler_t function to filter wxWidgets alert messages when reading/writing a file
 // when switching the locale to LC_NUMERIC, "C"
 // It is used in class LOCALE_IO to hide a useless (in kicad) wxWidgets alert message
 void KiAssertFilter( const wxString &file, int line,
-                                  const wxString &func, const wxString &cond,
-                                  const wxString &msg)
+                     const wxString &func, const wxString &cond,
+                     const wxString &msg)
 {
    if( !msg.Contains( "Decimal separator mismatch" ) )
-        wxTheApp->OnAssertFailure( file, line, func, cond, msg );
+        wxTheApp->OnAssertFailure( file.c_str(), line, func.c_str(), cond.c_str(), msg.c_str() );
 }
 #endif
-
+#endif

 std::atomic<unsigned int> LOCALE_IO::m_c_count( 0 );
-
-
-// Note on Windows, setlocale( LC_NUMERIC, "C" ) works fine to read/write
-// files with floating point numbers, but generates a overzealous wx alert
-// in some cases (reading a bitmap for instance)
-// So we disable alerts during the time a file is read or written
-
-LOCALE_IO::LOCALE_IO()
+LOCALE_IO::LOCALE_IO() : m_wxLocale( nullptr )
 {
    // use thread safe, atomic operation
    if( m_c_count++ == 0 )
    {
+#if USE_WXLOCALE
+        m_wxLocale = new wxLocale( "C", "C", "C", false );
+#else
        // Store the user locale name, to restore this locale later, in dtor
        m_user_locale = setlocale( LC_NUMERIC, nullptr );
 #if defined( _WIN32 ) && defined( DEBUG )
@@ -92,6 +105,7 @@ LOCALE_IO::LOCALE_IO()
 #endif
        // Switch the locale to C locale, to read/write files with fp numbers
        setlocale( LC_NUMERIC, "C" );
+#endif
    }
 }

@@ -102,10 +116,15 @@ LOCALE_IO::~LOCALE_IO()
    if( --m_c_count == 0 )
    {
        // revert to the user locale
+#if USE_WXLOCALE
+        delete m_wxLocale;      // Deleting m_wxLocale restored previous locale
+        m_wxLocale = nullptr;
+#else
        setlocale( LC_NUMERIC, m_user_locale.c_str() );
 #if defined( _WIN32 ) && defined( DEBUG )
        // Enable wxWidgets alerts
        wxSetDefaultAssertHandler();
+#endif
 #endif
    }
 }
@@ -425,7 +444,7 @@ wxString KIwxExpandEnvVars(const wxString& str)
                    if( !expanded )
                        strResult << (wxChar)bracket;

-                    str_m = str[++m];
+                    m++;
                }
            }

@@ -450,6 +469,11 @@ wxString KIwxExpandEnvVars(const wxString& str)
        }
    }

+#ifndef __WINDOWS__
+    if( strResult.StartsWith( "~" ) )
+        strResult.Replace( "~", wxGetHomeDir(), false );
+#endif // __WINDOWS__
+
    return strResult;
 }

@@ -89,10 +89,10 @@ bool KIDIALOG::Show( bool aShow )
            return it->second;
    }

-    bool ret = wxRichMessageDialog::Show( aShow );
+    int ret = wxRichMessageDialog::Show( aShow );

-    // Has the user asked not to show the dialog again
-    if( IsCheckBoxChecked() )
+    // Has the user asked not to show the dialog again and it was confirmed
+    if( IsCheckBoxChecked() && ret != wxID_CANCEL )
        doNotShowAgainDlgs[m_hash] = ret;

    return ret;
@@ -110,7 +110,7 @@ int KIDIALOG::ShowModal()
    int ret = wxRichMessageDialog::ShowModal();

    // Has the user asked not to show the dialog again
-    if( IsCheckBoxChecked() )
+    if( IsCheckBoxChecked() && ret != wxID_CANCEL )
        doNotShowAgainDlgs[m_hash] = ret;

    return ret;
@@ -64,7 +64,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
    aInfo.SetAppName( Pgm().App().GetAppName() );

    /* Copyright information */
-    aInfo.SetCopyright( "(C) 1992-2019 KiCad Developers Team" );
+    aInfo.SetCopyright( "(C) 1992-2020 KiCad Developers Team" );

    /* KiCad build version */
    wxString version;
@@ -152,8 +152,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
    description << "<ul>";
    description << "<li>"
                << _( "Report or examine bugs - " )
-                << HtmlHyperlink( "https://bugs.launchpad.net/kicad/+bugs?orderby=-id&start=0",
-                                  "https://bugs.launchpad.net/kicad" )
+                << HtmlHyperlink( "https://gitlab.com/kicad/code/kicad/issues" )
                << "</li>";
    description << "</ul></p>";

@@ -167,11 +166,6 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
                << HtmlHyperlink( "https://forum.kicad.info" )
                << "</li>";

-    description << "<li>"
-                <<_(  "KiCad user's group - " )
-                << HtmlHyperlink( "https://groups.yahoo.com/neo/groups/kicad-users/info" )
-                << "</li>";
-
    description << "</ul></p>";

    aInfo.SetDescription( description );
@@ -23,6 +23,18 @@

 #define ALPHA_MAX 100   // the max value returned by the alpha (opacity) slider

+
+// Configure the spin controls contained inside the dialog
+void configureSpinCtrl( wxSpinCtrl* aCtrl )
+{
+    wxSize textLength = aCtrl->GetTextExtent( "999" );
+    wxSize ctrlSize   = aCtrl->GetSizeFromTextSize( textLength );
+
+    aCtrl->SetMinSize( ctrlSize );
+    aCtrl->SetSize( ctrlSize );
+}
+
+
 DIALOG_COLOR_PICKER::DIALOG_COLOR_PICKER( wxWindow* aParent, KIGFX::COLOR4D& aCurrentColor,
                                          bool aAllowOpacityControl, CUSTOM_COLORS_LIST* aUserColors )
 	: DIALOG_COLOR_PICKER_BASE( aParent )
@@ -131,6 +143,13 @@ bool DIALOG_COLOR_PICKER::TransferDataToWindow()
    SetEditVals( ALL_CHANGED );
    drawAll();

+    // Configure the spin control sizes
+    configureSpinCtrl( m_spinCtrlGreen );
+    configureSpinCtrl( m_spinCtrlBlue );
+    configureSpinCtrl( m_spinCtrlRed );
+    configureSpinCtrl( m_spinCtrlHue );
+    configureSpinCtrl( m_spinCtrlSaturation );
+
    m_notebook->GetPage( 0 )->Layout();
    m_notebook->GetPage( 1 )->Layout();

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 28 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -56,18 +56,12 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	fgSizerRGB->Add( m_staticTextB, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

 	m_spinCtrlRed = new wxSpinCtrl( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlRed->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerRGB->Add( m_spinCtrlRed, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

 	m_spinCtrlGreen = new wxSpinCtrl( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlGreen->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerRGB->Add( m_spinCtrlGreen, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

 	m_spinCtrlBlue = new wxSpinCtrl( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlBlue->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerRGB->Add( m_spinCtrlBlue, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );


@@ -103,13 +97,9 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID
 	fgSizerHSV->Add( m_staticTextSat, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

 	m_spinCtrlHue = new wxSpinCtrl( sbSizerViewHSV->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 359, 0 );
-	m_spinCtrlHue->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerHSV->Add( m_spinCtrlHue, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

 	m_spinCtrlSaturation = new wxSpinCtrl( sbSizerViewHSV->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 255, 128 );
-	m_spinCtrlSaturation->SetMinSize( wxSize( 80,-1 ) );
-
 	fgSizerHSV->Add( m_spinCtrlSaturation, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );


@@ -14,7 +14,6 @@
        <property name="file">dialog_color_picker_base</property>
        <property name="first_id">1000</property>
        <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
        <property name="indent_with_spaces"></property>
        <property name="internationalize">1</property>
        <property name="name">DIALOG_COLOR_PICKER_BASE</property>
@@ -26,7 +25,6 @@
        <property name="skip_php_events">1</property>
        <property name="skip_python_events">1</property>
        <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
        <property name="use_enum">0</property>
        <property name="use_microsoft_bom">0</property>
        <object class="Dialog" expanded="1">
@@ -506,7 +504,7 @@
                                                                            <property name="min">0</property>
                                                                            <property name="min_size"></property>
                                                                            <property name="minimize_button">0</property>
-                                                                            <property name="minimum_size">80,-1</property>
+                                                                            <property name="minimum_size">-1,-1</property>
                                                                            <property name="moveable">1</property>
                                                                            <property name="name">m_spinCtrlRed</property>
                                                                            <property name="pane_border">1</property>
@@ -569,7 +567,7 @@
                                                                            <property name="min">0</property>
                                                                            <property name="min_size"></property>
                                                                            <property name="minimize_button">0</property>
-                                                                            <property name="minimum_size">80,-1</property>
+                                                                            <property name="minimum_size">-1,-1</property>
                                                                            <property name="moveable">1</property>
                                                                            <property name="name">m_spinCtrlGreen</property>
                                                                            <property name="pane_border">1</property>
@@ -632,7 +630,7 @@
                                                                            <property name="min">0</property>
                                                                            <property name="min_size"></property>
                                                                            <property name="minimize_button">0</property>
-                                                                            <property name="minimum_size">80,-1</property>
+                                                                            <property name="minimum_size">-1,-1</property>
                                                                            <property name="moveable">1</property>
                                                                            <property name="name">m_spinCtrlBlue</property>
                                                                            <property name="pane_border">1</property>
@@ -918,7 +916,7 @@
                                                                                    <property name="min">0</property>
                                                                                    <property name="min_size"></property>
                                                                                    <property name="minimize_button">0</property>
-                                                                                    <property name="minimum_size">80,-1</property>
+                                                                                    <property name="minimum_size">-1,-1</property>
                                                                                    <property name="moveable">1</property>
                                                                                    <property name="name">m_spinCtrlHue</property>
                                                                                    <property name="pane_border">1</property>
@@ -981,7 +979,7 @@
                                                                                    <property name="min">0</property>
                                                                                    <property name="min_size"></property>
                                                                                    <property name="minimize_button">0</property>
-                                                                                    <property name="minimum_size">80,-1</property>
+                                                                                    <property name="minimum_size">-1,-1</property>
                                                                                    <property name="moveable">1</property>
                                                                                    <property name="name">m_spinCtrlSaturation</property>
                                                                                    <property name="pane_border">1</property>
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 28 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -221,14 +221,17 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()

    for( int row = 0; row < m_EnvVars->GetNumberRows(); ++row )
    {
-        wxString name = m_EnvVars->GetCellValue( row, EV_NAME_COL );
-        wxString path = m_EnvVars->GetCellValue( row, EV_PATH_COL );
-        wxString external = m_EnvVars->GetCellValue( row, EV_FLAG_COL );
+        wxString     name = m_EnvVars->GetCellValue( row, EV_NAME_COL );
+        wxString     path = m_EnvVars->GetCellValue( row, EV_PATH_COL );
+        wxString     external = m_EnvVars->GetCellValue( row, EV_FLAG_COL );
+        ENV_VAR_ITEM var( path );

        if( external.Length() )
-            continue;
-
-        if( name.IsEmpty() )
+        {
+            // Don't check for consistency on external variables, just use them as-is
+            var.SetDefinedExternally( true );
+        }
+        else if( name.IsEmpty() )
        {
            m_errorGrid = m_EnvVars;
            m_errorRow = row;
@@ -245,7 +248,7 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
            return false;
        }

-        envVarMap[ name ] = ENV_VAR_ITEM( path );
+        envVarMap[ name ] = var;
    }

    Pgm().SetLocalEnvVariables( envVarMap );
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version Aug 15 2019)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,33 +12,36 @@
 DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
+
 	wxBoxSizer* bMainSizer;
 	bMainSizer = new wxBoxSizer( wxVERTICAL );
-	
+
 	m_htmlWindow = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
 	m_htmlWindow->SetMinSize( wxSize( 400,250 ) );
-	
+
 	bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 5 );
-	
-	m_buttonClose = new wxButton( this, wxID_CANCEL, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonClose->SetDefault(); 
-	bMainSizer->Add( m_buttonClose, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
+
+	m_sdbSizer1 = new wxStdDialogButtonSizer();
+	m_sdbSizer1OK = new wxButton( this, wxID_OK );
+	m_sdbSizer1->AddButton( m_sdbSizer1OK );
+	m_sdbSizer1->Realize();
+
+	bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND, 5 );
+
+
 	this->SetSizer( bMainSizer );
 	this->Layout();
 	bMainSizer->Fit( this );
-	
+
 	// Connect Events
 	m_htmlWindow->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnHTMLLinkClicked ), NULL, this );
-	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnCloseButtonClick ), NULL, this );
+	m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnOKButtonClick ), NULL, this );
 }

 DIALOG_DISPLAY_HTML_TEXT_BASE::~DIALOG_DISPLAY_HTML_TEXT_BASE()
 {
 	// Disconnect Events
 	m_htmlWindow->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnHTMLLinkClicked ), NULL, this );
-	m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnCloseButtonClick ), NULL, this );
-	
+	m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_HTML_TEXT_BASE::OnOKButtonClick ), NULL, this );
+
 }
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="13" />
+    <FileVersion major="1" minor="15" />
    <object class="Project" expanded="1">
        <property name="class_decoration"></property>
        <property name="code_generation">C++</property>
@@ -14,6 +14,8 @@
        <property name="file">dialog_display_info_HTML_base</property>
        <property name="first_id">1000</property>
        <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
+        <property name="indent_with_spaces"></property>
        <property name="internationalize">1</property>
        <property name="name">dialog_display_info_HTML</property>
        <property name="namespace"></property>
@@ -24,6 +26,7 @@
        <property name="skip_php_events">1</property>
        <property name="skip_python_events">1</property>
        <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
        <property name="use_enum">0</property>
        <property name="use_microsoft_bom">0</property>
        <object class="Dialog" expanded="1">
@@ -52,52 +55,16 @@
            <property name="window_extra_style"></property>
            <property name="window_name"></property>
            <property name="window_style"></property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
            <object class="wxBoxSizer" expanded="1">
                <property name="minimum_size">-1,-1</property>
                <property name="name">bMainSizer</property>
                <property name="orient">wxVERTICAL</property>
                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
+                <object class="sizeritem" expanded="0">
                    <property name="border">5</property>
                    <property name="flag">wxALL|wxEXPAND</property>
                    <property name="proportion">1</property>
-                    <object class="wxHtmlWindow" expanded="1">
+                    <object class="wxHtmlWindow" expanded="0">
                        <property name="BottomDockable">1</property>
                        <property name="LeftDockable">1</property>
                        <property name="RightDockable">1</property>
@@ -149,120 +116,26 @@
                        <property name="window_extra_style"></property>
                        <property name="window_name"></property>
                        <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnHtmlCellClicked"></event>
-                        <event name="OnHtmlCellHover"></event>
                        <event name="OnHtmlLinkClicked">OnHTMLLinkClicked</event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
                    </object>
                </object>
                <object class="sizeritem" expanded="1">
                    <property name="border">5</property>
-                    <property name="flag">wxALIGN_RIGHT|wxALL</property>
+                    <property name="flag">wxBOTTOM|wxEXPAND</property>
                    <property name="proportion">0</property>
-                    <object class="wxButton" expanded="1">
-                        <property name="BottomDockable">1</property>
-                        <property name="LeftDockable">1</property>
-                        <property name="RightDockable">1</property>
-                        <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
-                        <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</property>
-                        <property name="center_pane">0</property>
-                        <property name="close_button">1</property>
-                        <property name="context_help"></property>
-                        <property name="context_menu">1</property>
-                        <property name="default">1</property>
-                        <property name="default_pane">0</property>
-                        <property name="dock">Dock</property>
-                        <property name="dock_fixed">0</property>
-                        <property name="docking">Left</property>
-                        <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font"></property>
-                        <property name="gripper">0</property>
-                        <property name="hidden">0</property>
-                        <property name="id">wxID_CANCEL</property>
-                        <property name="label">OK</property>
-                        <property name="max_size"></property>
-                        <property name="maximize_button">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="min_size"></property>
-                        <property name="minimize_button">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">0</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">1</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
                        <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_buttonClose</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
+                        <property name="name">m_sdbSizer1</property>
                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style"></property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip"></property>
-                        <property name="validator_data_type"></property>
-                        <property name="validator_style">wxFILTER_NONE</property>
-                        <property name="validator_type">wxDefaultValidator</property>
-                        <property name="validator_variable"></property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <event name="OnButtonClick">OnCloseButtonClick</event>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
+                        <event name="OnOKButtonClick">OnOKButtonClick</event>
                    </object>
                </object>
            </object>
@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version Aug 15 2019)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////

-#ifndef __DIALOG_DISPLAY_INFO_HTML_BASE_H__
-#define __DIALOG_DISPLAY_INFO_HTML_BASE_H__
+#pragma once

 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -18,8 +17,8 @@
 #include <wx/colour.h>
 #include <wx/settings.h>
 #include <wx/string.h>
-#include <wx/button.h>
 #include <wx/sizer.h>
+#include <wx/button.h>
 #include <wx/dialog.h>

 ///////////////////////////////////////////////////////////////////////////
@@ -31,21 +30,21 @@
 class DIALOG_DISPLAY_HTML_TEXT_BASE : public DIALOG_SHIM
 {
 	private:
-	
+
 	protected:
-		wxButton* m_buttonClose;
-		
+		wxStdDialogButtonSizer* m_sdbSizer1;
+		wxButton* m_sdbSizer1OK;
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnHTMLLinkClicked( wxHtmlLinkEvent& event ) { event.Skip(); }
-		virtual void OnCloseButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
 	public:
 		wxHtmlWindow* m_htmlWindow;
-		
-		DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+
+		DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_DISPLAY_HTML_TEXT_BASE();
-	
+
 };

-#endif //__DIALOG_DISPLAY_INFO_HTML_BASE_H__
@@ -174,6 +174,7 @@ bool PANEL_COMMON_SETTINGS::TransferDataFromWindow()
 void PANEL_COMMON_SETTINGS::OnScaleSlider( wxScrollEvent& aEvent )
 {
    m_iconScaleAuto->SetValue( false );
+    aEvent.Skip();
 }


@@ -26,6 +26,7 @@
 #include <wildcards_and_files_ext.h>
 #include <gal/color4d.h>
 #include <wx/clipbrd.h>
+#include <kicad_string.h>

 WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow*      parent,
                                            wxWindowID     id,
@@ -402,7 +403,10 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event )

    for( const REPORT_LINE& l : m_report )
    {
-        f.Write( generatePlainText( l ) );
+        wxString s = generatePlainText( l );
+
+        ConvertSmartQuotesAndDashes( &s );
+        f.Write( s );
    }

    f.Close();
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2007 Jean-Pierre Charras, jp.charras at wanadoo.fr
 * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -23,10 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-/**
- * @file displlst.cpp
- */
-
 #include <fctsys.h>
 #include <macros.h>
 #include <draw_frame.h>
@@ -46,11 +42,9 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl
                                  const std::vector<wxArrayString>& aItemList,
                                  const wxString& aSelection,
                                  void( *aCallBackFunction )( wxString&, void* ),
-                                  void* aCallBackFunctionData,
-                                  bool aSortList, bool aShowHeaders ) :
+                                  void* aCallBackFunctionData ) :
    EDA_LIST_DIALOG_BASE( aParent, wxID_ANY, aTitle )
 {
-    m_sortList    = aSortList;
    m_cb_func     = aCallBackFunction;
    m_cb_data     = aCallBackFunctionData;
    m_itemsListCp = &aItemList;
@@ -59,9 +53,6 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl

    initDialog( aItemHeaders, aSelection );

-    if( !aShowHeaders )
-        m_listBox->SetSingleStyle( wxLC_NO_HEADER, true );
-
    // DIALOG_SHIM needs a unique hash_key because classname is not sufficient
    // because so many dialogs share this same class, with different numbers of
    // columns, different column names, and column widths.
@@ -111,15 +102,10 @@ void EDA_LIST_DIALOG::initDialog( const wxArrayString& aItemHeaders, const wxStr
 }


-void EDA_LIST_DIALOG::SetFilterHint( const wxString& aHint )
-{
-    m_filterBox->SetHint( aHint );
-}
-
-
 void EDA_LIST_DIALOG::SetListLabel( const wxString& aLabel )
 {
    m_listLabel->SetLabel( aLabel );
+    m_listBox->SetSingleStyle( wxLC_NO_HEADER, true );
 }


@@ -148,8 +134,7 @@ void EDA_LIST_DIALOG::textChangeInFilterBox( wxCommandEvent& event )
        }
    }

-    if( m_sortList )
-        sortList();
+    sortList();
 }


@@ -219,8 +204,7 @@ void EDA_LIST_DIALOG::InsertItems( const std::vector< wxArrayString >& itemList,
        }
    }

-    if( m_sortList )
-        sortList();
+    sortList();
 }


@@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2013-2017 CERN
- * Copyright (C) 2013-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2013-2020 KiCad Developers, see AUTHORS.txt for contributors.
 * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
 * @author Maciej Suminski <maciej.suminski@cern.ch>
 *
@@ -148,7 +148,15 @@ void EDA_DRAW_PANEL_GAL::SetFocus()

 void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
 {
-    m_viewControls->UpdateScrollbars();
+    DoRePaint();
+}
+
+
+void EDA_DRAW_PANEL_GAL::DoRePaint()
+{
+    // Repaint the canvas, and fix scrollbar cursors
+    // Usually called by a OnPaint event, but because it does not use a wxPaintDC,
+    // it can be called outside a wxPaintEvent.

    // Update current zoom settings if the canvas is managed by a EDA frame
    // (i.e. not by a preview panel in a dialog)
@@ -160,6 +168,8 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
        GetParentEDAFrame()->SetScrollCenterPosition( wxPoint( center.x, center.y ) );
    }

+    m_viewControls->UpdateScrollbars();
+
    if( !m_gal->IsVisible() )
        return;

@@ -231,7 +241,7 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )

 #ifdef __WXDEBUG__
    totalRealTime.Stop();
-    wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::onPaint(): %.1f ms", totalRealTime.msecs() );
+    wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::DoRePaint(): %.1f ms", totalRealTime.msecs() );
 #endif /* PROFILE */

    m_lastRefresh = wxGetLocalTimeMillis();
@@ -284,8 +294,9 @@ void EDA_DRAW_PANEL_GAL::Refresh( bool aEraseBackground, const wxRect* aRect )

 void EDA_DRAW_PANEL_GAL::ForceRefresh()
 {
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+    //wxPaintEvent redrawEvent;
+    //wxPostEvent( this, redrawEvent );
+    DoRePaint();
 }


@@ -495,8 +506,9 @@ void EDA_DRAW_PANEL_GAL::onRefreshTimer( wxTimerEvent& aEvent )
        }
    }

-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+    //wxPaintEvent redrawEvent;
+    //wxPostEvent( this, redrawEvent );
+    DoRePaint();
 }


@@ -68,6 +68,12 @@ static const wxString entrySizeX = "Size_x"; ///< Width of frame, in pixels (suf
 static const wxString entryMaximized = "Maximized";  ///< Nonzero iff frame is maximized (suffix)
 ///@}

+
+BEGIN_EVENT_TABLE( EDA_BASE_FRAME, wxFrame )
+    EVT_MOVE( EDA_BASE_FRAME::OnMove )
+END_EVENT_TABLE()
+
+
 EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
        const wxString& aTitle, const wxPoint& aPos, const wxSize& aSize,
        long aStyle, const wxString& aFrameName ) :
@@ -279,18 +285,34 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
        aCfg->Read( text, &m_autoSaveInterval, DEFAULT_AUTO_SAVE_INTERVAL );
    }

-    // Ensure the window is on a connected display, and is visible.
-    // (at least a corner of the frame must be visible on screen)
-    // Sometimes, if a window was moved on an auxiliary display, and when this
-    // display is no more available, it is not the case.
-    wxRect rect( m_FramePos, m_FrameSize );
+    // Ensure window isn't bigger than can be displayed
+    int displayIndex = wxDisplay::GetFromPoint( m_FramePos );

-    if( wxDisplay::GetFromPoint( rect.GetTopLeft() ) == wxNOT_FOUND &&
-        wxDisplay::GetFromPoint( rect.GetTopRight() ) == wxNOT_FOUND &&
-        wxDisplay::GetFromPoint( rect.GetBottomLeft() ) == wxNOT_FOUND &&
-        wxDisplay::GetFromPoint( rect.GetBottomRight() ) == wxNOT_FOUND )
-    {
+    if( displayIndex == wxNOT_FOUND )
+        displayIndex = 0;
+
+    wxDisplay display( displayIndex );
+    wxRect clientSize = display.GetClientArea();
+
+    // The window may have been saved on a display that is no longer present.
+    // First, check the window origin and move it if it's off the chosen display
+
+    if( m_FramePos.x >= clientSize.x + clientSize.width ||
+        m_FramePos.y >= clientSize.y + clientSize.height )
        m_FramePos = wxDefaultPosition;
+
+    // Now, fix up the size if needed
+
+    if( m_FrameSize.x + m_FramePos.x > clientSize.x + clientSize.width )
+    {
+        m_FrameSize.x = clientSize.width;
+        m_FramePos.x = 0;
+    }
+
+    if( m_FrameSize.y + m_FramePos.y > clientSize.y + clientSize.height )
+    {
+        m_FrameSize.y = clientSize.height;
+        m_FramePos.y = 0;
    }

    // Ensure Window title bar is visible
@@ -302,7 +324,12 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
    int Ypos_min = 0;
 #endif
    if( m_FramePos.y < Ypos_min )
+    {
+        if( m_FrameSize.y + ( Ypos_min - m_FramePos.y ) > clientSize.height)
+            m_FrameSize.y = clientSize.height - Ypos_min;
+
        m_FramePos.y = Ypos_min;
+    }

    if( maximized )
        Maximize();
@@ -185,9 +185,9 @@ bool FILENAME_RESOLVER::createPathList()

    if( GetKicadPaths( epaths ) )
    {
-        for( const auto& i : epaths )
+        for( const wxString& curr_path : epaths )
        {
-            wxString pathVal = ExpandEnvVarSubstitutions( i );
+            wxString pathVal = ExpandEnvVarSubstitutions( curr_path );

            if( pathVal.empty() )
            {
@@ -200,8 +200,8 @@ bool FILENAME_RESOLVER::createPathList()
                lpath.m_pathexp = fndummy.GetFullPath();
            }

-            lpath.m_alias =  i;
-            lpath.m_pathvar = i;
+            lpath.m_alias =  curr_path;
+            lpath.m_pathvar = curr_path;

            if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() )
                lpath.m_pathexp.erase( --lpath.m_pathexp.end() );
@@ -219,9 +219,8 @@ bool FILENAME_RESOLVER::createPathList()
 #ifdef DEBUG
    wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" );
    std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();

-    while( sPL != ePL )
+    while( sPL != m_Paths.end() )
    {
        wxLogTrace( MASK_3D_RESOLVER, "   + %s : '%s'\n", (*sPL).m_alias.GetData(),
            (*sPL).m_pathexp.GetData() );
@@ -636,9 +635,9 @@ bool FILENAME_RESOLVER::writePathList()

    // skip all ${ENV_VAR} alias names
    std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end();

-    while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
+    while( sPL != m_Paths.end() &&
+           ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) )
        ++sPL;

    wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG );
@@ -662,7 +661,7 @@ bool FILENAME_RESOLVER::writePathList()
    cfgFile << "#V" << CFGFILE_VERSION << "\n";
    std::string tstr;

-    while( sPL != ePL )
+    while( sPL != m_Paths.end() )
    {
        tstr = sPL->m_alias.ToUTF8();
        cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
@@ -762,10 +761,9 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )

    wxCriticalSectionLocker lock( lock_resolver );
    std::list< SEARCH_PATH >::const_iterator sL = m_Paths.begin();
-    std::list< SEARCH_PATH >::const_iterator eL = m_Paths.end();
    size_t idx;

-    while( sL != eL )
+    while( sL != m_Paths.end() )
    {
        // undefined paths do not participate in the
        // file name shortening procedure
@@ -949,7 +947,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString&

    if( nchars > 0 )
    {
-        aResult = aString.substr( i2, nchars );
+        aResult = wxString::FromUTF8( aString.substr( i2, nchars ).c_str() );
        i2 += nchars;
    }

@@ -259,11 +259,12 @@ long long FP_LIB_TABLE::GenerateTimestamp( const wxString* aNickname )
 }


-void FP_LIB_TABLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aNickname )
+void FP_LIB_TABLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aNickname,
+                                       bool aBestEfforts )
 {
    const FP_LIB_TABLE_ROW* row = FindRow( aNickname );
    wxASSERT( (PLUGIN*) row->plugin );
-    row->plugin->FootprintEnumerate( aFootprintNames, row->GetFullURI( true ),
+    row->plugin->FootprintEnumerate( aFootprintNames, row->GetFullURI( true ), aBestEfforts,
                                     row->GetProperties() );
 }

@@ -78,6 +78,9 @@ CAIRO_GAL_BASE::~CAIRO_GAL_BASE()

    if( context )
        cairo_destroy( context );
+
+    for( auto imageSurface : imageSurfaces )
+        cairo_surface_destroy( imageSurface );
 }


@@ -424,8 +427,11 @@ void CAIRO_GAL_BASE::DrawPolygon( const SHAPE_LINE_CHAIN& aPolygon )


 void CAIRO_GAL_BASE::DrawCurve( const VECTOR2D& aStartPoint, const VECTOR2D& aControlPointA,
-                           const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint )
+                                const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint,
+                                double aFilterValue )
 {
+    // Note: aFilterValue is not used because the cubic Bezier curve is
+    // supported by Cairo.
    syncLineWidth();

    const auto sp = roundp( xform( aStartPoint ) );
@@ -499,7 +505,9 @@ void CAIRO_GAL_BASE::DrawBitmap( const BITMAP_BASE& aBitmap )
    cairo_surface_mark_dirty( image );
    cairo_set_source_surface( currentContext, image, 0, 0 );
    cairo_paint( currentContext );
-    cairo_surface_destroy( image );
+
+    // store the image handle so it can be destroyed later
+    imageSurfaces.push_back( image );

    isElementAdded = true;

@@ -920,6 +928,11 @@ void CAIRO_GAL_BASE::EnableDepthTest( bool aEnabled )

 void CAIRO_GAL_BASE::resetContext()
 {
+    for( auto imageSurface : imageSurfaces )
+        cairo_surface_destroy( imageSurface );
+
+    imageSurfaces.clear();
+
    ClearScreen();

    // Compute the world <-> screen transformations
@@ -1256,10 +1269,13 @@ void CAIRO_GAL::endDrawing()

    // Now translate the raw context data from the format stored
    // by cairo into a format understood by wxImage.
-    pixman_image_t* dstImg = pixman_image_create_bits( PIXMAN_r8g8b8,
+
+    pixman_image_t* dstImg = pixman_image_create_bits(
+            wxPlatformInfo::Get().GetEndianness() == wxENDIAN_LITTLE ? PIXMAN_b8g8r8 :
+                                                                       PIXMAN_r8g8b8,
            screenSize.x, screenSize.y, (uint32_t*) wxOutput, wxBufferWidth * 3 );
-    pixman_image_t* srcImg = pixman_image_create_bits( PIXMAN_a8b8g8r8,
-            screenSize.x, screenSize.y, (uint32_t*) bitmapBuffer, wxBufferWidth * 4 );
+    pixman_image_t* srcImg = pixman_image_create_bits( PIXMAN_a8r8g8b8, screenSize.x, screenSize.y,
+            (uint32_t*) bitmapBuffer, wxBufferWidth * 4 );

    pixman_image_composite( PIXMAN_OP_SRC, srcImg, NULL, dstImg,
            0, 0, 0, 0, 0, 0, screenSize.x, screenSize.y );
@@ -1281,6 +1297,16 @@ void CAIRO_GAL::endDrawing()
 }


+void CAIRO_GAL::PostPaint( wxPaintEvent& aEvent )
+{
+    // posts an event to m_paint_listener to ask for redraw the canvas.
+    if( paintListener )
+    {
+        wxPostEvent( paintListener, aEvent );
+    }
+}
+
+
 void CAIRO_GAL::ResizeScreen( int aWidth, int aHeight )
 {
    CAIRO_GAL_BASE::ResizeScreen( aWidth, aHeight );
@@ -1486,9 +1512,9 @@ void CAIRO_GAL::setCompositor()
 }


-void CAIRO_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
+void CAIRO_GAL::onPaint( wxPaintEvent& aEvent )
 {
-    PostPaint();
+    PostPaint( aEvent );
 }


@@ -63,11 +63,13 @@ CAIRO_PRINT_CTX::CAIRO_PRINT_CTX( wxDC* aDC )
 #ifdef __WXGTK__
    m_ctx = static_cast<cairo_t*>( gctx->GetNativeContext() );
    m_surface = cairo_get_target( m_ctx );
-    // On linux, cairo printers are 72 DPI by default. This is an ususable resolution for us.
-    // A reasonable resolution is 600 DPI
+    // On linux, cairo printers have 72 DPI by default.
+    // This is an unusable resolution for us.
+    // A better resolution could be 4800 DPI (at 600 DPI, we still have minor
+    // but visible artifacts, for instance with arcs, but not at 4800 DPI)
    // so modify the default:
    #define DEFAULT_DPI 72.0
-    #define KICAD_PRINTER_DPI 600.0
+    #define KICAD_PRINTER_DPI 4800.0
    // our device scale is DEFAULT_DPI / KICAD_PRINTER_DPI
    cairo_surface_set_device_scale( m_surface, DEFAULT_DPI/KICAD_PRINTER_DPI, DEFAULT_DPI/KICAD_PRINTER_DPI );
    m_dpi = KICAD_PRINTER_DPI;
@@ -133,14 +135,6 @@ CAIRO_PRINT_GAL::CAIRO_PRINT_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
 }


-void CAIRO_PRINT_GAL::SetLineWidth( float aLineWidth )
-{
-    storePath();
-    lineWidth = aLineWidth;
-    cairo_set_line_width( currentContext, aLineWidth );
-}
-
-
 void CAIRO_PRINT_GAL::ComputeWorldScreenMatrix()
 {
    worldScale = screenDPI * worldUnitLength * zoomFactor;
@@ -64,6 +64,7 @@ static const wxChar* traceGalDispOpts = wxT( "KICAD_GAL_DISPLAY_OPTIONS" );
 GAL_DISPLAY_OPTIONS::GAL_DISPLAY_OPTIONS()
    : gl_antialiasing_mode( OPENGL_ANTIALIASING_MODE::NONE ),
      cairo_antialiasing_mode( CAIRO_ANTIALIASING_MODE::NONE ),
+      m_dpi( nullptr, nullptr ),
      m_gridStyle( GRID_STYLE::DOTS ),
      m_gridLineWidth( 1.0 ),
      m_gridMinSpacing( 10.0 ),
@@ -109,12 +110,10 @@ void GAL_DISPLAY_OPTIONS::ReadCommonConfig( wxConfigBase& aCommonConfig, wxWindo
            CAIRO_ANTIALIASING_MODE_KEY, &temp, (int) KIGFX::CAIRO_ANTIALIASING_MODE::NONE );
    cairo_antialiasing_mode = (KIGFX::CAIRO_ANTIALIASING_MODE) temp;

-    {
-        const DPI_SCALING dpi{ &aCommonConfig, aWindow };
-        m_scaleFactor = dpi.GetScaleFactor();
-    }
+    m_dpi = DPI_SCALING( &aCommonConfig, aWindow );

-    NotifyChanged();
+    // Also calls NotifyChanged
+    UpdateScaleFactor();
 }


@@ -146,6 +145,13 @@ void GAL_DISPLAY_OPTIONS::WriteConfig( wxConfigBase& aCfg, const wxString& aBase
 }


+void GAL_DISPLAY_OPTIONS::UpdateScaleFactor()
+{
+    m_scaleFactor = m_dpi.GetScaleFactor();
+    NotifyChanged();
+}
+
+
 void GAL_DISPLAY_OPTIONS::NotifyChanged()
 {
    wxLogTrace( traceGalDispOpts, "Change notification" );
@@ -282,7 +282,6 @@ const float SHADER_FILLED_CIRCLE        = 2.0;
 const float SHADER_STROKED_CIRCLE       = 3.0;
 const float SHADER_FONT                 = 4.0;
 const float SHADER_LINE_A               = 5.0;
-const float SHADER_LINE_B               = 6.0;

 varying vec4 shaderParams;
 varying vec2 circleCoords;
@@ -302,12 +301,6 @@ void filledCircle( vec2 aCoord )

 float pixelSegDistance( vec2 aCoord )
 {
-    if( shaderParams[0] == SHADER_LINE_B )
-    {
-        gl_FragColor = gl_Color;
-        return 0.0;
-    }
-
    float aspect = shaderParams[1];
    float dist;
    vec2 v = vec2( 1.0 - ( aspect - abs( aCoord.s ) ), aCoord.t );
@@ -361,19 +354,23 @@ float median( vec3 v )

 void main()
 {
-    if( shaderParams[0] == SHADER_LINE_A )
+    // VS to FS pipeline does math that means we can't rely on the mode
+    // parameter being bit-exact without rounding it first.
+    float mode = floor( shaderParams[0] + 0.5 );
+
+    if( mode == SHADER_LINE_A )
    {
        drawLine( gl_TexCoord[0].st );
    }
-    else if( shaderParams[0] == SHADER_FILLED_CIRCLE )
+    else if( mode == SHADER_FILLED_CIRCLE )
    {
        filledCircle( circleCoords );
    }
-    else if( shaderParams[0] == SHADER_STROKED_CIRCLE )
+    else if( mode == SHADER_STROKED_CIRCLE )
    {
        strokedCircle( circleCoords, shaderParams[2], shaderParams[3] );
    }
-    else if( shaderParams[0] == SHADER_FONT )
+    else if( mode == SHADER_FONT )
    {
        vec2 tex           = shaderParams.yz;

@@ -33,6 +33,7 @@
 #include <geometry/shape_poly_set.h>
 #include <text_utils.h>
 #include <bitmap_base.h>
+#include <bezier_curves.h>

 #include <macros.h>

@@ -325,6 +326,16 @@ OPENGL_GAL::~OPENGL_GAL()
 }


+void OPENGL_GAL::PostPaint( wxPaintEvent& aEvent )
+{
+    // posts an event to m_paint_listener to ask for redraw the canvas.
+    if( paintListener )
+    {
+        wxPostEvent( paintListener, aEvent );
+    }
+}
+
+
 bool OPENGL_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
 {
    bool refresh = false;
@@ -602,7 +613,12 @@ void OPENGL_GAL::DrawLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoin
 void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint,
                              double aWidth )
 {
-    if( aStartPoint == aEndPoint )  // 0 length segments are just a circle.
+    VECTOR2D startEndVector = aEndPoint - aStartPoint;
+    double lineLength = startEndVector.EuclideanNorm();
+
+    // segments having a length <= 1 are just a circle.
+    // Moreover trying to draw them as a segment does not work fine.
+    if( lineLength <= 1 )
    {
        DrawCircle( aStartPoint, aWidth/2 );
        return;
@@ -617,10 +633,8 @@ void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndP
    }
    else
    {
-        auto startEndVector = aEndPoint - aStartPoint;
        auto lineAngle      = startEndVector.Angle();
        // Outlined tracks
-        double lineLength = startEndVector.EuclideanNorm();

        SetLineWidth( 1.0 );
        currentManager->Color( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );
@@ -1034,34 +1048,21 @@ void OPENGL_GAL::DrawPolygon( const SHAPE_LINE_CHAIN& aPolygon )


 void OPENGL_GAL::DrawCurve( const VECTOR2D& aStartPoint, const VECTOR2D& aControlPointA,
-                            const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint )
+                            const VECTOR2D& aControlPointB, const VECTOR2D& aEndPoint,
+                            double aFilterValue )
 {
-    // FIXME The drawing quality needs to be improved
-    // FIXME Perhaps choose a quad/triangle strip instead?
-    // FIXME Brute force method, use a better (recursive?) algorithm
+    std::vector<VECTOR2D> output;
+    std::vector<VECTOR2D> pointCtrl;

-    std::deque<VECTOR2D> pointList;
+    pointCtrl.push_back( aStartPoint );
+    pointCtrl.push_back( aControlPointA );
+    pointCtrl.push_back( aControlPointB );
+    pointCtrl.push_back( aEndPoint );

-    double t  = 0.0;
-    double dt = 1.0 / (double) CURVE_POINTS;
+    BEZIER_POLY converter( pointCtrl );
+    converter.GetPoly( output, aFilterValue );

-    for( int i = 0; i <= CURVE_POINTS; i++ )
-    {
-        double omt  = 1.0 - t;
-        double omt2 = omt * omt;
-        double omt3 = omt * omt2;
-        double t2   = t * t;
-        double t3   = t * t2;
-
-        VECTOR2D vertex = omt3 * aStartPoint + 3.0 * t * omt2 * aControlPointA
-                          + 3.0 * t2 * omt * aControlPointB + t3 * aEndPoint;
-
-        pointList.push_back( vertex );
-
-        t += dt;
-    }
-
-    DrawPolyline( pointList );
+    DrawPolyline( &output[0], output.size() );
 }


@@ -1923,9 +1924,9 @@ std::pair<VECTOR2D, float> OPENGL_GAL::computeBitmapTextSize( const UTF8& aText
 }


-void OPENGL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
+void OPENGL_GAL::onPaint( wxPaintEvent& aEvent )
 {
-    PostPaint();
+    PostPaint( aEvent );
 }


@@ -60,7 +60,7 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe
        double   glyphEndX = 0.0;
        VECTOR2D glyphBoundingX;

-        std::deque<VECTOR2D>* pointList = nullptr;
+        std::vector<VECTOR2D>* pointList = nullptr;

        int i = 0;

@@ -105,7 +105,7 @@ bool STROKE_FONT::LoadNewStrokeFont( const char* const aNewStrokeFont[], int aNe

                if( !pointList )
                {
-                    glyph.emplace_back( std::deque<VECTOR2D>() );
+                    glyph.emplace_back( std::vector<VECTOR2D>() );
                    pointList = &glyph.back();
                }

@@ -140,17 +140,16 @@ BOX2D STROKE_FONT::computeBoundingBox( const GLYPH& aGLYPH, const VECTOR2D& aGLY
 {
    BOX2D boundingBox;

-    std::deque<VECTOR2D> boundingPoints;
+    std::vector<VECTOR2D> boundingPoints;

    boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.x, 0 ) );
    boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.y, 0 ) );

-    for( GLYPH::const_iterator pointListIt = aGLYPH.begin(); pointListIt != aGLYPH.end(); ++pointListIt )
+    for( const auto& pointList : aGLYPH )
    {
-        for( std::deque<VECTOR2D>::const_iterator pointIt = pointListIt->begin();
-                pointIt != pointListIt->end(); ++pointIt )
+        for( const auto& pt : pointList )
        {
-            boundingPoints.emplace_back( VECTOR2D( aGLYPHBoundingX.x, pointIt->y ) );
+            boundingPoints.emplace_back( aGLYPHBoundingX.x, pt.y );
        }
    }

@@ -341,15 +340,13 @@ void STROKE_FONT::drawSingleLineText( const UTF8& aText )
            last_had_overbar = false;
        }

-        for( GLYPH::iterator pointListIt = glyph.begin(); pointListIt != glyph.end();
-             ++pointListIt )
+        for( const auto& pointList : glyph )
        {
            std::deque<VECTOR2D> pointListScaled;

-            for( std::deque<VECTOR2D>::iterator pointIt = pointListIt->begin();
-                 pointIt != pointListIt->end(); ++pointIt )
+            for( const auto& pt : pointList )
            {
-                VECTOR2D pointPos( pointIt->x * glyphSize.x + xOffset, pointIt->y * glyphSize.y );
+                VECTOR2D pointPos( pt.x * glyphSize.x + xOffset, pt.y * glyphSize.y );

                if( m_gal->IsFontItalic() )
                {
@@ -170,8 +170,8 @@ std::string GBR_APERTURE_METADATA::FormatAttribute( GBR_APERTURE_ATTRIB aAttribu
        attribute_string = "TA.AperFunction,Conductor";
        break;

-    case GBR_APERTURE_ATTRIB_CUTOUT:        // print info associated to a outline
-        attribute_string = "TA.AperFunction,CutOut";
+    case GBR_APERTURE_ATTRIB_EDGECUT:       // print info associated to a board outline (edge.cut layer)
+        attribute_string = "TA.AperFunction,Profile";
        break;

    case GBR_APERTURE_ATTRIB_VIAPAD:        // print info associated to a flashed via
@@ -268,33 +268,78 @@ std::string GBR_APERTURE_METADATA::FormatAttribute( GBR_APERTURE_ATTRIB aAttribu
    return full_attribute_string;
 }

+
+// Helper function to convert a ascii hex char to its integer value
+// If the char is not a hexa char, return -1
+int char2Hex( unsigned aCode )
+{
+    if( aCode >= '0' && aCode <= '9' )
+        return aCode - '0';
+
+    if( aCode >= 'A' && aCode <= 'F' )
+        return aCode - 'A' + 10;
+
+    if( aCode >= 'a' && aCode <= 'f' )
+        return aCode - 'a' + 10;
+
+    return -1;
+}
+
+
 wxString FormatStringFromGerber( const wxString& aString )
 {
    // make the inverse conversion of formatStringToGerber()
    // It converts a "normalized" gerber string and convert it to a 16 bits sequence unicode
    // and return a wxString (unicode 16) from the gerber string
+    // Note the initial gerber string can already contain unicode chars.
    wxString txt;

-    for( unsigned ii = 0; ii < aString.Length(); ++ii )
+    unsigned count = aString.Length();
+
+    for( unsigned ii = 0; ii < count; ++ii )
    {
        unsigned code = aString[ii];

-        if( code == '\\' )
+        if( code == '\\' && ii < count-5 && aString[ii+1] == 'u' )
        {
-            // Convert 4 hexadecimal digits to a 16 bit unicode
+            // Note the latest Gerber X2 spec (2019 06) uses \uXXXX to encode
+            // the unicode XXXX hexadecimal value
+            // If 4 chars next to 'u' are hexadecimal chars,
+            // convert these 4 hexadecimal digits to a 16 bit unicode
            // (Gerber allows only 4 hexadecimal digits)
+            // If an error occurs, the escape sequence is not translated,
+            // and used "as this"
            long value = 0;
+            bool error = false;

            for( int jj = 0; jj < 4; jj++ )
            {
                value <<= 4;
-                code = aString[++ii];
-                // Very basic conversion, but it expects a valid gerber file
-                int hexa = (code <= '9' ? code - '0' : code - 'A' + 10) & 0xF;
-                value += hexa;
+                code = aString[ii+jj+2];
+
+                int hexa = char2Hex( code );
+
+                if( hexa >= 0 )
+                    value += hexa;
+                else
+                {
+                    error = true;
+                    break;
+                }
            }

-            txt.Append( wxChar( value ) );
+            if( !error )
+            {
+                if( value >= ' ' )  // Is a valid wxChar ?
+                    txt.Append( wxChar( value ) );
+
+                ii += 5;
+            }
+            else
+            {
+                txt.Append( aString[ii] );
+                continue;
+            }
        }
        else
            txt.Append( aString[ii] );
@@ -334,12 +379,10 @@ std::string formatStringToGerber( const wxString& aString )

        if( convert || code > 0x7F )
        {
-            txt += '\\';
-
            // Convert code to 4 hexadecimal digit
            // (Gerber allows only 4 hexadecimal digit)
            char hexa[32];
-            sprintf( hexa,"%4.4X", code & 0xFFFF);
+            sprintf( hexa,"\\u%4.4X", code & 0xFFFF);
            txt += hexa;
        }
        else
@@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -54,6 +54,25 @@ int GetArcToSegmentCount( int aRadius, int aErrorMax, double aArcAngleDegree )
 }


+// When creating polygons to create a clearance polygonal area, the polygon must
+// be same or bigger than the original shape.
+// Polygons are bigger if the original shape has arcs (round rectangles, ovals, circles...)
+// In some cases (in fact only one: when building layer solder mask) modifying
+// shapes when converting them to polygons is not acceptable (the modification
+// can break calculations)
+// so one can disable the shape expansion by calling KeepPolyInsideShape( true )
+// Important: calling KeepPolyInsideShape( false ) after calculations is
+// mandatory to break oher calculations
+static bool s_disable_arc_correction = false;
+
+// Enable (aInside = false) or disable (aInside = true) polygonal shape expansion
+// when converting pads shapes and other items shapes to polygons:
+void DisableArcRadiusCorrection( bool aDisable )
+{
+    s_disable_arc_correction = aDisable;
+}
+
+
 double GetCircletoPolyCorrectionFactor( int aSegCountforCircle )
 {
    /* calculates the coeff to compensate radius reduction of circle
@@ -66,7 +85,7 @@ double GetCircletoPolyCorrectionFactor( int aSegCountforCircle )
    if( aSegCountforCircle < MIN_SEGCOUNT_FOR_CIRCLE )
        aSegCountforCircle = MIN_SEGCOUNT_FOR_CIRCLE;

-    return 1.0 / cos( M_PI / aSegCountforCircle );
+    return s_disable_arc_correction ? 1.0 : 1.0 / cos( M_PI / aSegCountforCircle );
 }


@@ -33,6 +33,7 @@ int sgn( T aVal )

 bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
 {
+    // See http://geomalgorithms.com/a02-_lines.html for some explanations and ideas.
    VECTOR2I d = B - A;
    ecoord dist_sq = (ecoord) aDist * aDist;

@@ -44,9 +45,17 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
    else if( t >= l_squared )
        return ( aP - B ).SquaredEuclideanNorm() < dist_sq;

-    int dxdy = abs( d.x ) - abs( d.y );
+    // JPC: This code is not trivial and is not commented
+    // and does not work for d.x or d.y = -1...1
+    // I am guessing it is here for calculation time optimization.
+    // if someone can understand it, please fix it.
+    // It can be tested with a segment having d.x or d.y value
+    // is -1 or +1 ("this" is a quasi vertical or horizontal segment)
+    int dxdy = std::abs( d.x ) - std::abs( d.y );

-    if( ( dxdy >= -1 && dxdy <= 1 ) || abs( d.x ) <= 1 || abs( d.y ) <= 1 )
+    if( ( dxdy >= -1 && dxdy <= 1 )     // quasi 45 deg segment
+        /*|| std::abs( d.x ) <= 1       // quasi horizontal segment
+          || std::abs( d.y ) <= 1       // quasi vertical segment */ )
    {
        int ca = -sgn( d.y );
        int cb = sgn( d.x );
@@ -458,6 +458,8 @@ int SHAPE_POLY_SET::AddHole( const SHAPE_LINE_CHAIN& aHole, int aOutline )

    POLYGON& poly = m_polys[aOutline];

+    assert( aOutline < (int)m_polys.size() );
+
    assert( poly.size() );

    poly.push_back( aHole );
@@ -32,6 +32,7 @@
 #include <trigo.h>
 #include <common.h>
 #include <math_for_graphics.h>
+#include <geometry/seg.h>

 // Returns true if the point P is on the segment S.
 // faster than TestSegmentHit() because P should be exactly on S
@@ -151,32 +152,8 @@ bool TestSegmentHit( const wxPoint &aRefPoint, wxPoint aStart, wxPoint aEnd, int
    if( aStart.y == aEnd.y && aRefPoint.x > xmin && aRefPoint.x < xmax )
        return std::abs( delta.y ) <= aDist;

-    // Special case for a segment with start == end (equal to a circle)
-    if ( aStart == aEnd )
-    {
-        long double length_square = (long double) delta.x * delta.x + (long double) delta.y * delta.y;
-        long double dist_square = (long double) aDist * aDist;
-
-        return ( length_square <= dist_square );
-    }
-
-    wxPoint len = aEnd - aStart;
-    // Precision note here:
-    // These are 32-bit integers, so squaring requires 64 bits to represent
-    // exactly.  64-bit Doubles have only 52 bits in the mantissa, so we start to lose
-    // precision at 2^53, which corresponds to ~ ±1nm @ 9.5cm, 2nm at 90cm, etc...
-    // Long doubles avoid this ambiguity as well as the more expensive denormal double calc
-    // Long doubles usually (sometimes more if SIMD) have at least 64 bits in the mantissa
-    long double length_square = (long double) len.x * len.x + (long double) len.y * len.y;
-    long double cross = std::abs( (long double) len.x * delta.y - (long double) len.y * delta.x );
-    long double dist_square = (long double) aDist * aDist;
-
-    // The perpendicular distance to a line is the vector magnitude of the line from
-    // a test point to the test line.  That is the 2d determinant.  Because we handled
-    // the zero length case above, so we are guaranteed a unique solution.
-
-    return ( ( length_square >= cross && dist_square >= cross ) ||
-             ( length_square * dist_square >= cross * cross ) );
+    SEG segment( aStart, aEnd );
+    return segment.PointCloserThan( aRefPoint, aDist + 1 );
 }


@@ -347,27 +347,32 @@ bool OpenPDF( const wxString& file )
    wxString command;
    wxString filename = file;

-    // Quote in case there are spaces in the file name.
-    AddDelimiterString( filename );
-
    Pgm().ReadPdfBrowserInfos();

    if( !Pgm().UseSystemPdfBrowser() )    //  Run the preferred PDF Browser
    {
-        command = Pgm().GetPdfBrowserName() + wxT( " " ) + filename;
+#ifdef __WXMSW__
+        // Windows requires double quotes around the filename to handle spaces
+        command = Pgm().GetPdfBrowserName() + wxT( " \"" ) + filename + wxT( "\"" );
+#else
+        command = Pgm().GetPdfBrowserName() + wxT( " '" ) + filename + wxT( "'" );
+#endif
    }
    else
    {
        if( wxLaunchDefaultApplication( filename ) )
            return true;

+#ifdef __WXMAC__
+        command = wxT( "/usr/bin/open -a '" ) + filename + wxT( "'" );
+#endif
        // If launching the system default PDF viewer fails, fall through with empty command
        // string so the error message is displayed.
    }

    if( !command.IsEmpty() )
    {
-        if( ProcessExecute( command ) )
+        if( ProcessExecute( command ) != -1 )
        {
            return true;
        }
@@ -1148,45 +1148,16 @@ void ClipAndDrawPoly( EDA_RECT* aClipBox, wxDC* aDC, wxPoint aPoints[], int n )
 }


-void GRBezier( EDA_RECT* ClipBox,
-               wxDC*     DC,
-               int       x1,
-               int       y1,
-               int       x2,
-               int       y2,
-               int       x3,
-               int       y3,
-               int       width,
-               COLOR4D   Color )
+void GRBezier( EDA_RECT* aClipBox, wxDC* aDC,
+               std::vector<wxPoint>& aPoint,
+               int aWidth, COLOR4D aColor )
 {
-    std::vector<wxPoint> points;
+    std::vector<wxPoint> output;

-    BEZIER_POLY converter( x1, y1, x2, y2, x3, y3 );
-    converter.GetPoly( points );
+    BEZIER_POLY converter( aPoint );
+    converter.GetPoly( output, aWidth );

-    GRPoly( ClipBox, DC, points.size(), &points[0], false, width, Color, Color );
-}
-
-
-void GRBezier( EDA_RECT* ClipBox,
-               wxDC*     DC,
-               int       x1,
-               int       y1,
-               int       x2,
-               int       y2,
-               int       x3,
-               int       y3,
-               int       x4,
-               int       y4,
-               int       width,
-               COLOR4D   Color )
-{
-    std::vector<wxPoint> points;
-
-    BEZIER_POLY converter( x1, y1, x2, y2, x3, y3, x4, y4 );
-    converter.GetPoly( points );
-
-    GRPoly( ClipBox, DC, points.size(), &points[0], false, width, Color, Color );
+    GRPoly( aClipBox, aDC, output.size(), &output[0], false, aWidth, aColor, aColor );
 }


@@ -500,7 +500,7 @@ void GRID_TRICKS::onUpdateUI( wxUpdateUIEvent& event )
            }
        }

-        if( !cursorInSelectedRow )
+        if( !cursorInSelectedRow && cursorRow >= 0 )
            m_grid->SelectRow( cursorRow );
    }
 }
@@ -39,7 +39,7 @@ static inline size_t hash_board_item( const BOARD_ITEM* aItem, int aFlags )
    size_t ret = 0;

    if( aFlags & LAYER )
-        ret ^= hash<unsigned long long>{}( aItem->GetLayerSet().to_ullong() );
+        ret = hash<unsigned long long>{}( aItem->GetLayerSet().to_ullong() );

    return ret;
 }
@@ -55,57 +55,57 @@ size_t hash_eda( const EDA_ITEM* aItem, int aFlags )
        {
            const MODULE* module = static_cast<const MODULE*>( aItem );

-            ret ^= hash_board_item( module, aFlags );
+            ret += hash_board_item( module, aFlags );

            if( aFlags & POSITION )
            {
-                ret ^= hash<int>{}( module->GetPosition().x );
-                ret ^= hash<int>{}( module->GetPosition().y );
+                ret += hash<int>{}( module->GetPosition().x );
+                ret += hash<int>{}( module->GetPosition().y );
            }

            if( aFlags & ROTATION )
-                ret ^= hash<double>{}( module->GetOrientation() );
+                ret += hash<double>{}( module->GetOrientation() );

            for( const BOARD_ITEM* i = module->GraphicalItemsList(); i; i = i->Next() )
-                ret ^= hash_eda( i, aFlags );
+                ret += hash_eda( i, aFlags );

            for( const D_PAD* i = module->PadsList(); i; i = i->Next() )
-                ret ^= hash_eda( i, aFlags );
+                ret += hash_eda( i, aFlags );
        }
        break;

    case PCB_PAD_T:
        {
            const D_PAD* pad = static_cast<const D_PAD*>( aItem );
-            ret ^= hash_board_item( pad, aFlags );
-            ret ^= hash<int>{}( pad->GetShape() << 16 );
-            ret ^= hash<int>{}( pad->GetDrillShape() << 18 );
-            ret ^= hash<int>{}( pad->GetSize().x << 8 );
-            ret ^= hash<int>{}( pad->GetSize().y << 9 );
-            ret ^= hash<int>{}( pad->GetOffset().x << 6 );
-            ret ^= hash<int>{}( pad->GetOffset().y << 7 );
-            ret ^= hash<int>{}( pad->GetDelta().x << 4 );
-            ret ^= hash<int>{}( pad->GetDelta().y << 5 );
+            ret += hash_board_item( pad, aFlags );
+            ret += hash<int>{}( pad->GetShape() << 16 );
+            ret += hash<int>{}( pad->GetDrillShape() << 18 );
+            ret += hash<int>{}( pad->GetSize().x << 8 );
+            ret += hash<int>{}( pad->GetSize().y << 9 );
+            ret += hash<int>{}( pad->GetOffset().x << 6 );
+            ret += hash<int>{}( pad->GetOffset().y << 7 );
+            ret += hash<int>{}( pad->GetDelta().x << 4 );
+            ret += hash<int>{}( pad->GetDelta().y << 5 );

            if( aFlags & POSITION )
            {
                if( aFlags & REL_COORD )
                {
-                    ret ^= hash<int>{}( pad->GetPos0().x );
-                    ret ^= hash<int>{}( pad->GetPos0().y );
+                    ret += hash<int>{}( pad->GetPos0().x );
+                    ret += hash<int>{}( pad->GetPos0().y );
                }
                else
                {
-                    ret ^= hash<int>{}( pad->GetPosition().x );
-                    ret ^= hash<int>{}( pad->GetPosition().y );
+                    ret += hash<int>{}( pad->GetPosition().x );
+                    ret += hash<int>{}( pad->GetPosition().y );
                }
            }

            if( aFlags & ROTATION )
-                ret ^= hash<double>{}( pad->GetOrientation() );
+                ret += hash<double>{}( pad->GetOrientation() );

            if( aFlags & NET )
-                ret ^= hash<int>{}( pad->GetNetCode() << 6 );
+                ret += hash<int>{}( pad->GetNetCode() << 6 );
        }
        break;

@@ -119,64 +119,64 @@ size_t hash_eda( const EDA_ITEM* aItem, int aFlags )
            if( !( aFlags & VALUE ) && text->GetType() == TEXTE_MODULE::TEXT_is_VALUE )
                break;

-            ret ^= hash_board_item( text, aFlags );
-            ret ^= hash<string>{}( text->GetText().ToStdString() );
-            ret ^= hash<bool>{}( text->IsItalic() );
-            ret ^= hash<bool>{}( text->IsBold() );
-            ret ^= hash<bool>{}( text->IsMirrored() );
-            ret ^= hash<int>{}( text->GetTextWidth() );
-            ret ^= hash<int>{}( text->GetTextHeight() );
-            ret ^= hash<int>{}( text->GetHorizJustify() );
-            ret ^= hash<int>{}( text->GetVertJustify() );
+            ret += hash_board_item( text, aFlags );
+            ret += hash<string>{}( text->GetText().ToStdString() );
+            ret += hash<bool>{}( text->IsItalic() );
+            ret += hash<bool>{}( text->IsBold() );
+            ret += hash<bool>{}( text->IsMirrored() );
+            ret += hash<int>{}( text->GetTextWidth() );
+            ret += hash<int>{}( text->GetTextHeight() );
+            ret += hash<int>{}( text->GetHorizJustify() );
+            ret += hash<int>{}( text->GetVertJustify() );

            if( aFlags & POSITION )
            {
                if( aFlags & REL_COORD )
                {
-                    ret ^= hash<int>{}( text->GetPos0().x );
-                    ret ^= hash<int>{}( text->GetPos0().y );
+                    ret += hash<int>{}( text->GetPos0().x );
+                    ret += hash<int>{}( text->GetPos0().y );
                }
                else
                {
-                    ret ^= hash<int>{}( text->GetPosition().x );
-                    ret ^= hash<int>{}( text->GetPosition().y );
+                    ret += hash<int>{}( text->GetPosition().x );
+                    ret += hash<int>{}( text->GetPosition().y );
                }
            }

            if( aFlags & ROTATION )
-                ret ^= hash<double>{}( text->GetTextAngle() );
+                ret += hash<double>{}( text->GetTextAngle() );
        }
        break;

    case PCB_MODULE_EDGE_T:
        {
            const EDGE_MODULE* segment = static_cast<const EDGE_MODULE*>( aItem );
-            ret ^= hash_board_item( segment, aFlags );
-            ret ^= hash<int>{}( segment->GetType() );
-            ret ^= hash<int>{}( segment->GetShape() );
-            ret ^= hash<int>{}( segment->GetWidth() );
-            ret ^= hash<int>{}( segment->GetRadius() );
+            ret += hash_board_item( segment, aFlags );
+            ret += hash<int>{}( segment->GetType() );
+            ret += hash<int>{}( segment->GetShape() );
+            ret += hash<int>{}( segment->GetWidth() );
+            ret += hash<int>{}( segment->GetRadius() );

            if( aFlags & POSITION )
            {
                if( aFlags & REL_COORD )
                {
-                    ret ^= hash<int>{}( segment->GetStart0().x );
-                    ret ^= hash<int>{}( segment->GetStart0().y );
-                    ret ^= hash<int>{}( segment->GetEnd0().x );
-                    ret ^= hash<int>{}( segment->GetEnd0().y );
+                    ret += hash<int>{}( segment->GetStart0().x );
+                    ret += hash<int>{}( segment->GetStart0().y );
+                    ret += hash<int>{}( segment->GetEnd0().x );
+                    ret += hash<int>{}( segment->GetEnd0().y );
                }
                else
                {
-                    ret ^= hash<int>{}( segment->GetStart().x );
-                    ret ^= hash<int>{}( segment->GetStart().y );
-                    ret ^= hash<int>{}( segment->GetEnd().x );
-                    ret ^= hash<int>{}( segment->GetEnd().y );
+                    ret += hash<int>{}( segment->GetStart().x );
+                    ret += hash<int>{}( segment->GetStart().y );
+                    ret += hash<int>{}( segment->GetEnd().x );
+                    ret += hash<int>{}( segment->GetEnd().y );
                }
            }

            if( aFlags & ROTATION )
-                ret ^= hash<double>{}( segment->GetAngle() );
+                ret += hash<double>{}( segment->GetAngle() );
        }
        break;

@@ -28,16 +28,20 @@
 #include <common.h>


-HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* parent, const wxString& aTitle) :
-    DIALOG_DISPLAY_HTML_TEXT_BASE( parent, wxID_ANY, aTitle )
+HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle,
+                                    const wxPoint& aPosition, const wxSize& aSize ) :
+    DIALOG_DISPLAY_HTML_TEXT_BASE( aParent, wxID_ANY, aTitle, aPosition, aSize )
 {
    m_htmlWindow->SetLayoutDirection( wxLayout_LeftToRight );
    ListClear();

    // Gives a default logical size (the actual size depends on the display definition)
-    SetSizeInDU( 320, 120 );
+    if( aSize != wxDefaultSize )
+        SetSizeInDU( aSize.x, aSize.y );

    Center();
+
+    m_sdbSizer1OK->SetDefault();
 }


@@ -49,12 +53,14 @@ HTML_MESSAGE_BOX::~HTML_MESSAGE_BOX()
 }


-void HTML_MESSAGE_BOX::OnCloseButtonClick( wxCommandEvent& event )
+void HTML_MESSAGE_BOX::OnOKButtonClick( wxCommandEvent& event )
 {
-    // the dialog can be shown modal or not modal.
+    // the dialog can be shown quasi-model, modal, or not modeless.
    // therefore, use the right way to close it.
-    if( IsModal() )
-        EndModal( 0 );
+    if( IsQuasiModal() )
+        EndQuasiModal( wxID_OK );
+    else if( IsModal() )
+        EndModal( wxID_OK );
    else
        Destroy();
 }
@@ -94,6 +94,7 @@ void KIWAY::SetTop( wxFrame* aTop )
 const wxString KIWAY::dso_search_path( FACE_T aFaceId )
 {
    const char*   name;
+    const char*   dirName;

    switch( aFaceId )
    {
@@ -110,6 +111,13 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
        return wxEmptyString;
    }

+    // The subdirectories usually have the same name as the kiface
+    switch( aFaceId )
+    {
+        case FACE_PL_EDITOR: dirName = "pagelayout_editor";   break;
+        default:             dirName = name + 1;              break;
+    }
+
 #ifndef __WXMAC__
    wxString path;

@@ -131,6 +139,25 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )

    fn.SetName( name );

+#ifdef DEBUG
+    // To speed up development, it's sometimes nice to run kicad from inside
+    // the build path.  In that case, each program will be in a subdirectory.
+    // To find the DSOs, we need to go up one directory and then enter a subdirectory.
+
+    if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
+    {
+#ifdef __WXMAC__
+        fn = wxStandardPaths::Get().GetExecutablePath();
+        fn.RemoveLastDir();
+        fn.AppendDir( wxT( "PlugIns" ) );
+        fn.SetName( name );
+#else
+        fn.RemoveLastDir();
+        fn.AppendDir( dirName );
+#endif
+    }
+#endif
+
    // Here a "suffix" == an extension with a preceding '.',
    // so skip the preceding '.' to get an extension
    fn.SetExt( KIFACE_SUFFIX + 1 );         // + 1 => &KIFACE_SUFFIX[1]
@@ -268,6 +268,7 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )

 void EDA_DRAW_FRAME::unitsChangeRefresh()
 {
+    ReCreateAuxiliaryToolbar();
    UpdateStatusBar();
    UpdateMsgPanel();
 }
@@ -298,6 +299,8 @@ void EDA_DRAW_FRAME::CommonSettingsChanged()
    m_canvas->SetEnableAutoPan( option );

    m_galDisplayOptions.ReadCommonConfig( *settings, this );
+
+    ReCreateAuxiliaryToolbar();
 }


@@ -428,6 +431,7 @@ void EDA_DRAW_FRAME::OnUpdateUnits( wxUpdateUIEvent& aEvent )

    aEvent.Check( enable );
    DisplayUnitsMsg();
+    ReCreateAuxiliaryToolbar();
 }


@@ -613,7 +617,7 @@ void EDA_DRAW_FRAME::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )

 void EDA_DRAW_FRAME::DisplayToolMsg( const wxString& msg )
 {
-    SetStatusText( msg, 5 );
+    SetStatusText( msg, 6 );
 }


@@ -672,6 +676,23 @@ void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv )
 }


+void EDA_DRAW_FRAME::OnMove( wxMoveEvent& aEvent )
+{
+    // If the window is moved to a different display, the scaling factor may change
+    double oldFactor = m_galDisplayOptions.m_scaleFactor;
+    m_galDisplayOptions.UpdateScaleFactor();
+
+    if( oldFactor != m_galDisplayOptions.m_scaleFactor )
+    {
+        wxSize clientSize = GetClientSize();
+        GetGalCanvas()->GetGAL()->ResizeScreen( clientSize.x, clientSize.y );
+        GetGalCanvas()->GetView()->MarkDirty();
+    }
+
+    aEvent.Skip();
+}
+
+
 void EDA_DRAW_FRAME::SetToolID( int aId, int aCursor, const wxString& aToolMsg )
 {
    // Keep default cursor in toolbars
@@ -271,6 +271,7 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )

 void EDA_DRAW_FRAME::unitsChangeRefresh()
 {
+    ReCreateAuxiliaryToolbar();
    UpdateStatusBar();
    UpdateMsgPanel();
 }
@@ -300,6 +301,8 @@ void EDA_DRAW_FRAME::CommonSettingsChanged()
    m_canvas->SetEnableAutoPan( option );

    m_galDisplayOptions.ReadCommonConfig( *settings, this );
+
+    ReCreateAuxiliaryToolbar();
 }


@@ -621,7 +624,7 @@ void EDA_DRAW_FRAME::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )

 void EDA_DRAW_FRAME::DisplayToolMsg( const wxString& msg )
 {
-    SetStatusText( msg, 5 );
+    SetStatusText( msg, 6 );
 }


@@ -687,6 +690,12 @@ void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv )
 }


+void EDA_DRAW_FRAME::OnMove( wxMoveEvent& aEvent )
+{
+    aEvent.Skip();
+}
+
+
 void EDA_DRAW_FRAME::SetToolID( int aId, int aCursor, const wxString& aToolMsg )
 {
    // Keep default cursor in toolbars
@@ -398,6 +398,12 @@ std::vector<wxString> LIB_TABLE::GetLogicalLibs()
        ret.push_back( *it );
    }

+    // We want to allow case-sensitive duplicates but sort by case-insensitive ordering
+    std::sort( ret.begin(), ret.end(), []( const wxString& lhs, const wxString& rhs )
+    {
+        return lhs.CmpNoCase( rhs ) < 0;
+    } );
+
    return ret;
 }

@@ -21,6 +21,7 @@

 #include <lib_tree_model.h>

+#include <algorithm>
 #include <eda_pattern_match.h>
 #include <lib_tree_item.h>
 #include <make_unique.h>
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
 * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software: you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -155,6 +155,7 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch )
    {
        wxWindowUpdateLocker updateLock( m_widget );

+        Freeze();
        // Even with the updateLock, wxWidgets sometimes ties its knickers in
        // a knot when trying to run a wxdataview_selection_changed_callback()
        // on a row that has been deleted.
@@ -162,7 +163,11 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch )
        m_widget->UnselectAll();

        Cleared();
-#ifndef __WINDOWS__
+        Thaw();
+
+        // This was fixed in wxWidgets 3.0.5 and 3.1.3.
+#if defined( __WXGTK__ ) && ( (wxVERSION_NUMBER < 030005 ) || \
+        ( ( wxVERSION_NUMBER >= 030100 ) && ( wxVERSION_NUMBER < 030103 ) ) )
        // The fastest method to update wxDataViewCtrl is to rebuild from
        // scratch by calling Cleared(). Linux requires to reassociate model to
        // display data, but Windows will create multiple associations.
@@ -310,6 +315,9 @@ bool LIB_TREE_MODEL_ADAPTER::IsContainer( wxDataViewItem const& aItem ) const

 wxDataViewItem LIB_TREE_MODEL_ADAPTER::GetParent( wxDataViewItem const& aItem ) const
 {
+    if( m_freeze )
+        return ToItem( nullptr );
+
    auto node = ToNode( aItem );
    auto parent = node ? node->Parent : nullptr;

@@ -451,7 +459,7 @@ LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowResults()
                   []( LIB_TREE_NODE const* n )
                   {
                       // return leaf nodes with some level of matching
-                       return n->Children.size() == 0 && n->Score > 1;
+                       return n->Type == LIB_TREE_NODE::TYPE::LIBID && n->Score > 1;
                   },
                   &highScore );

@@ -286,17 +286,20 @@ std::string LSET::FmtHex() const

    static const char hex[] = "0123456789abcdef";

-    int     nibble_count = ( size() + 3 ) / 4;
+    unsigned nibble_count = ( size() + 3 ) / 4;

-    for( int nibble=0;  nibble<nibble_count;  ++nibble )
+    for( unsigned nibble = 0; nibble < nibble_count; ++nibble )
    {
        unsigned ndx = 0;

        // test 4 consecutive bits and set ndx to 0-15:
-        for( int nibble_bit=0;  nibble_bit<4;  ++nibble_bit )
+        for( unsigned nibble_bit = 0; nibble_bit < 4; ++nibble_bit )
        {
-            if( (*this)[nibble_bit + nibble*4] )
-                ndx |= (1 << nibble_bit);
+            if( ( nibble_bit + nibble * 4 ) >= size() )
+                break;
+
+            if( (*this)[nibble_bit + nibble * 4] )
+                ndx |= ( 1 << nibble_bit );
        }

        if( nibble && !( nibble % 8 ) )
@@ -1,8 +1,8 @@
 /*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
- * Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -170,9 +170,8 @@ bool GERBER_PLOTTER::StartPlot()

    finalFile = outputFile;     // the actual gerber file will be created later

-    // Create a temporary filename to store gerber file
-    // note tmpfile() does not work under Vista and W7 in user mode
-    m_workFilename = filename + wxT(".tmp");
+    // Create a temp file in system temp to avoid potential network share buffer issues for the final read and save
+    m_workFilename = wxFileName::CreateTempFileName( "" );
    workFile   = wxFopen( m_workFilename, wxT( "wt" ));
    outputFile = workFile;
    wxASSERT( outputFile );
@@ -217,6 +216,10 @@ bool GERBER_PLOTTER::StartPlot()
    // Be sure the usual dark polarity is selected:
    fputs( "%LPD*%\n", outputFile );

+    // Set initial interpolation mode: always G01 (linear):
+    fputs( "G01*\n", outputFile );
+
+    // Set aperture list starting point:
    fputs( "G04 APERTURE LIST*\n", outputFile );

    return true;
@@ -327,10 +330,7 @@ void GERBER_PLOTTER::selectAperture( const wxSize&           aSize,
                  ( currentAperture->m_Type != aType ) ||
                  ( currentAperture->m_Size != aSize );

-    if( !m_useNetAttributes )
-        aApertureAttribute = 0;
-    else
-        change = change || ( currentAperture->m_ApertureAttribute != aApertureAttribute );
+    change = change || ( currentAperture->m_ApertureAttribute != aApertureAttribute );

    if( change )
    {
@@ -474,21 +474,34 @@ void GERBER_PLOTTER::Arc( const wxPoint& aCenter, double aStAngle, double aEndAn
 {
    SetCurrentLineWidth( aWidth );

+    // aFill is not used here.
+    plotArc( aCenter, aStAngle, aEndAngle, aRadius, false );
+}
+
+
+void GERBER_PLOTTER::plotArc( const wxPoint& aCenter, double aStAngle, double aEndAngle,
+                  int aRadius, bool aPlotInRegion )
+{
    wxPoint start, end;
    start.x = aCenter.x + KiROUND( cosdecideg( aRadius, aStAngle ) );
    start.y = aCenter.y - KiROUND( sindecideg( aRadius, aStAngle ) );
-    MoveTo( start );
+
+    if( !aPlotInRegion )
+        MoveTo( start );
+    else
+        LineTo( start );
+
    end.x = aCenter.x + KiROUND( cosdecideg( aRadius, aEndAngle ) );
    end.y = aCenter.y - KiROUND( sindecideg( aRadius, aEndAngle ) );
    DPOINT devEnd = userToDeviceCoordinates( end );
    DPOINT devCenter = userToDeviceCoordinates( aCenter ) - userToDeviceCoordinates( start );

-    fprintf( outputFile, "G75*\n" ); // Multiquadrant (360 degrees) mode
+    fprintf( outputFile, "G75*\n" );        // Multiquadrant (360 degrees) mode

    if( aStAngle < aEndAngle )
-        fprintf( outputFile, "G03" );
+        fprintf( outputFile, "G03*\n" );    // Active circular interpolation, CCW
    else
-        fprintf( outputFile, "G02" );
+        fprintf( outputFile, "G02*\n" );    // Active circular interpolation, CW

    fprintf( outputFile, "X%dY%dI%dJ%dD01*\n",
             KiROUND( devEnd.x ), KiROUND( devEnd.y ),
@@ -498,7 +511,45 @@ void GERBER_PLOTTER::Arc( const wxPoint& aCenter, double aStAngle, double aEndAn
 }


-void GERBER_PLOTTER:: PlotPoly( const std::vector< wxPoint >& aCornerList,
+void GERBER_PLOTTER::PlotGerberRegion( const std::vector< wxPoint >& aCornerList,
+                                 void * aData )
+{
+    if( aCornerList.size() <= 2 )
+        return;
+
+    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );
+
+    bool clearTA_AperFunction = false;     // true if a TA.AperFunction is used
+
+    if( gbr_metadata )
+    {
+        std::string attrib = gbr_metadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
+
+        if( !attrib.empty() )
+        {
+            fputs( attrib.c_str(), outputFile );
+            clearTA_AperFunction = true;
+        }
+    }
+
+    PlotPoly( aCornerList, FILLED_SHAPE, 0 , gbr_metadata );
+
+    // Clear the TA attribute, to avoid the next item to inherit it:
+    if( clearTA_AperFunction )
+    {
+        if( m_useX2format )
+        {
+            fputs( "%TD.AperFunction*%\n", outputFile );
+        }
+        else
+        {
+            fputs( "G04 #@! TD.AperFunction*\n", outputFile );
+        }
+    }
+}
+
+
+void GERBER_PLOTTER::PlotPoly( const std::vector< wxPoint >& aCornerList,
                               FILL_T aFill, int aWidth, void * aData )
 {
    if( aCornerList.size() <= 1 )
@@ -524,7 +575,10 @@ void GERBER_PLOTTER:: PlotPoly( const std::vector< wxPoint >& aCornerList,
        for( unsigned ii = 1; ii < aCornerList.size(); ii++ )
            LineTo( aCornerList[ii] );

-        FinishTo( aCornerList[0] );
+        // If the polygon is not closed, close it:
+        if( aCornerList[0] != aCornerList[aCornerList.size()-1] )
+            FinishTo( aCornerList[0] );
+
        fputs( "G37*\n", outputFile );
    }

@@ -676,7 +730,7 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub
    wxSize size( aSize );
    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );

-    /* Plot a flashed shape. */
+    // Flash a vertical or horizontal shape (this is a basic aperture).
    if( ( orient == 0 || orient == 900 || orient == 1800 || orient == 2700 )
        && trace_mode == FILLED )
    {
@@ -692,56 +746,29 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub

        emitDcode( pos_dev, 3 );
    }
-    else /* Plot pad as a segment. */
+    else    // Plot pad as region.
+            // Only regions and flashed items accept a object attribute TO.P for the pin name
    {
-        if( size.x > size.y )
-        {
-            std::swap( size.x, size.y );
-
-            if( orient < 2700 )
-                orient += 900;
-            else
-                orient -= 2700;
-        }
-
        if( trace_mode == FILLED )
        {
-            // TODO: use an aperture macro to declare the rotated pad
-
-            // Flash a pad anchor, if a netlist attribute is set
-            if( aData )
-                FlashPadCircle( pos, size.x, trace_mode, aData );
-
-            // The pad is reduced to an segment with dy > dx
-            int delta = size.y - size.x;
-            int x0    = 0;
-            int y0    = -delta / 2;
-            int x1    = 0;
-            int y1    = delta / 2;
-            RotatePoint( &x0, &y0, orient );
-            RotatePoint( &x1, &y1, orient );
-            GBR_METADATA metadata;
-
-            if( gbr_metadata )
+            // Draw the oval as round rect pad with a radius = 50% min size)
+            // In gerber file, it will be drawn as a region with arcs, and can be
+            // detected as pads (similar to a flashed pad)
+            FlashPadRoundRect( pos, aSize, std::min( aSize.x, aSize.y ) /2,
+                               orient, FILLED, aData );
+        }
+        else    // Non filled shape: plot outlines:
+        {
+            if( size.x > size.y )
            {
-                metadata = *gbr_metadata;
+                std::swap( size.x, size.y );

-                // If the pad is drawn on a copper layer,
-                // set attribute to GBR_APERTURE_ATTRIB_CONDUCTOR
-                if( metadata.IsCopper() )
-                    metadata.SetApertureAttrib( GBR_APERTURE_METADATA::GBR_APERTURE_ATTRIB_CONDUCTOR );
-
-                // Clear .P attribute, only allowed for flashed items
-                wxString attrname( ".P" );
-                metadata.m_NetlistMetadata.ClearAttribute( &attrname );
+                if( orient < 2700 )
+                    orient += 900;
+                else
+                    orient -= 2700;
            }

-            ThickSegment( wxPoint( pos.x + x0, pos.y + y0 ),
-                           wxPoint( pos.x + x1, pos.y + y1 ),
-                           size.x, trace_mode, &metadata );
-        }
-        else
-        {
            sketchOval( pos, size, orient, -1 );
        }
    }
@@ -821,83 +848,208 @@ void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
                                     EDA_DRAW_MODE_T aTraceMode, void* aData )

 {
-    GBR_METADATA gbr_metadata;
+    GBR_METADATA* gbr_metadata = static_cast<GBR_METADATA*>( aData );

-    if( aData )
+    if( aTraceMode != FILLED )
    {
-        gbr_metadata = *static_cast<GBR_METADATA*>( aData );
-        // If the pad is drawn on a copper layer,
-        // set attribute to GBR_APERTURE_ATTRIB_CONDUCTOR
-        if( gbr_metadata.IsCopper() )
-            gbr_metadata.SetApertureAttrib( GBR_APERTURE_METADATA::GBR_APERTURE_ATTRIB_CONDUCTOR );
+        SHAPE_POLY_SET outline;
+        const int segmentToCircleCount = 64;
+        TransformRoundRectToPolygon( outline, aPadPos, aSize, aOrient,
+                                     aCornerRadius, segmentToCircleCount );

-        wxString attrname( ".P" );
-        gbr_metadata.m_NetlistMetadata.ClearAttribute( &attrname );   // not allowed on inner layers
-    }
-
-    if( aTraceMode != FILLED )
        SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
-
-    // Currently, a Pad RoundRect is plotted as polygon.
-    // TODO: use Aperture macro and flash it
-    SHAPE_POLY_SET outline;
-    const int segmentToCircleCount = 64;
-    TransformRoundRectToPolygon( outline, aPadPos, aSize, aOrient,
-                                 aCornerRadius, segmentToCircleCount );
-
-    if( aTraceMode != FILLED )
        outline.Inflate( -GetCurrentLineWidth()/2, 16 );

-    std::vector< wxPoint > cornerList;
-    // TransformRoundRectToPolygon creates only one convex polygon
-    SHAPE_LINE_CHAIN& poly = outline.Outline( 0 );
-    cornerList.reserve( poly.PointCount() + 1 );
+        std::vector< wxPoint > cornerList;
+        // TransformRoundRectToPolygon creates only one convex polygon
+        SHAPE_LINE_CHAIN& poly = outline.Outline( 0 );
+        cornerList.reserve( poly.PointCount() + 1 );

-    for( int ii = 0; ii < poly.PointCount(); ++ii )
-        cornerList.push_back( wxPoint( poly.Point( ii ).x, poly.Point( ii ).y ) );
+        for( int ii = 0; ii < poly.PointCount(); ++ii )
+            cornerList.emplace_back( poly.CPoint( ii ).x, poly.CPoint( ii ).y );

-    // Close polygon
-    cornerList.push_back( cornerList[0] );
+        // Close polygon
+        cornerList.push_back( cornerList[0] );

-    PlotPoly( cornerList, aTraceMode == FILLED ? FILLED_SHAPE : NO_FILL,
-              aTraceMode == FILLED ? 0 : GetCurrentLineWidth(), &gbr_metadata );
-
-    // Now, flash a pad anchor, if a netlist attribute is set
-    // (remove me when a Aperture macro will be used)
-    if( aData && aTraceMode == FILLED )
+        // plot outlines
+        PlotPoly( cornerList, NO_FILL, GetCurrentLineWidth(), gbr_metadata );
+    }
+    else
    {
-        int diameter = std::min( aSize.x, aSize.y );
-        FlashPadCircle( aPadPos, diameter, aTraceMode , aData );
+        // A Pad RoundRect is plotted as a Gerber region.
+        // Initialize region metadata:
+        bool clearTA_AperFunction = false;     // true if a TA.AperFunction is used
+
+        if( gbr_metadata )
+        {
+            formatNetAttribute( &gbr_metadata->m_NetlistMetadata );
+            std::string attrib = gbr_metadata->m_ApertureMetadata.FormatAttribute( !m_useX2format );
+
+            if( !attrib.empty() )
+            {
+                fputs( attrib.c_str(), outputFile );
+                clearTA_AperFunction = true;
+            }
+        }
+
+        // Plot the region using arcs in corners.
+        plotRoundRectAsRegion( aPadPos, aSize, aCornerRadius, aOrient );
+
+        // Clear the TA attribute, to avoid the next item to inherit it:
+        if( clearTA_AperFunction )
+        {
+            if( m_useX2format )
+            {
+                fputs( "%TD.AperFunction*%\n", outputFile );
+            }
+            else
+            {
+                fputs( "G04 #@! TD.AperFunction*\n", outputFile );
+            }
+        }
    }
 }

+
+void GERBER_PLOTTER::plotRoundRectAsRegion( const wxPoint& aRectCenter, const wxSize& aSize,
+                                            int aCornerRadius, double aOrient )
+{
+    // The region outline is generated by 4 sides and 4 90 deg arcs
+    //  1 --- 2
+    //  |  c  |
+    //  4 --- 3
+
+    // Note also in user coordinates the Y axis is from top to bottom
+    // for historical reasons.
+
+    // A helper structure to handle outlines coordinates (segments and arcs)
+    // in user coordinates
+    struct RR_EDGE
+    {
+        wxPoint m_start;
+        wxPoint m_end;
+        wxPoint m_center;
+        // in decidegrees: angle start. angle end = m_arc_angle_start+arc_angle
+        double  m_arc_angle_start;
+    };
+
+    const double arc_angle = -900.0;    // in decidegrees
+    int hsizeX = aSize.x/2;
+    int hsizeY = aSize.y/2;
+
+    RR_EDGE curr_edge;
+    std::vector<RR_EDGE> rr_outline;
+
+    // Build outline coordinates, relative to rectangle center, rotation 0:
+
+    // Top left corner 1 (and 4 to 1 left vertical side @ x=-hsizeX)
+    curr_edge.m_start.x = -hsizeX;
+    curr_edge.m_start.y = hsizeY - aCornerRadius;
+    curr_edge.m_end.x = curr_edge.m_start.x;
+    curr_edge.m_end.y = -hsizeY + aCornerRadius;
+    curr_edge.m_center.x = -hsizeX + aCornerRadius;
+    curr_edge.m_center.y = curr_edge.m_end.y;
+    curr_edge.m_arc_angle_start = aOrient + 1800.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // Top right corner 2 (and 1 to 2 top horizontal side @ y=-hsizeY)
+    curr_edge.m_start.x = -hsizeX + aCornerRadius;
+    curr_edge.m_start.y = -hsizeY;
+    curr_edge.m_end.x = hsizeX - aCornerRadius;
+    curr_edge.m_end.y = curr_edge.m_start.y;
+    curr_edge.m_center.x = curr_edge.m_end.x;
+    curr_edge.m_center.y = -hsizeY + aCornerRadius;
+    curr_edge.m_arc_angle_start = aOrient + 900.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // bottom right corner 3 (and 2 to 3 right vertical side @ x=hsizeX)
+    curr_edge.m_start.x = hsizeX;
+    curr_edge.m_start.y = -hsizeY + aCornerRadius;
+    curr_edge.m_end.x =  curr_edge.m_start.x;
+    curr_edge.m_end.y = hsizeY - aCornerRadius;
+    curr_edge.m_center.x = hsizeX - aCornerRadius;
+    curr_edge.m_center.y = curr_edge.m_end.y;
+    curr_edge.m_arc_angle_start = aOrient + 0.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // bottom left corner 4 (and 3 to 4 bottom horizontal side @ y=hsizeY)
+    curr_edge.m_start.x = hsizeX - aCornerRadius;
+    curr_edge.m_start.y = hsizeY;
+    curr_edge.m_end.x =  -hsizeX + aCornerRadius;
+    curr_edge.m_end.y = curr_edge.m_start.y;
+    curr_edge.m_center.x = curr_edge.m_end.x;
+    curr_edge.m_center.y = hsizeY - aCornerRadius;
+    curr_edge.m_arc_angle_start = aOrient - 900.0;     // En decidegree
+
+    rr_outline.push_back( curr_edge );
+
+    // Move relative coordinates to the actual location and rotation:
+    wxPoint arc_last_center;
+    int arc_last_angle = curr_edge.m_arc_angle_start+arc_angle;
+
+    for( RR_EDGE& rr_edge: rr_outline )
+    {
+        RotatePoint( &rr_edge.m_start, aOrient );
+        RotatePoint( &rr_edge.m_end, aOrient );
+        RotatePoint( &rr_edge.m_center, aOrient );
+        rr_edge.m_start += aRectCenter;
+        rr_edge.m_end += aRectCenter;
+        rr_edge.m_center += aRectCenter;
+        arc_last_center = rr_edge.m_center;
+    }
+
+    // Ensure the region is a closed polygon, i.e. the end point of last segment
+    // (end of arc) is the same as the first point. Rounding issues can create a
+    // small difference, mainly for rotated pads.
+    // calculate last point (end of last arc):
+    wxPoint last_pt;
+    last_pt.x = arc_last_center.x + KiROUND( cosdecideg( aCornerRadius, arc_last_angle ) );
+    last_pt.y = arc_last_center.y - KiROUND( sindecideg( aCornerRadius, arc_last_angle ) );
+
+    wxPoint first_pt = rr_outline[0].m_start;
+
+#if 0    // For test only:
+    if( last_pt != first_pt )
+        wxLogMessage( "first pt %d %d last pt %d %d",
+                      first_pt.x, first_pt.y, last_pt.x, last_pt.y );
+#endif
+
+    fputs( "G36*\n", outputFile );  // Start region
+    fputs( "G01*\n", outputFile );  // Set linear interpolation.
+    first_pt = last_pt;
+    MoveTo( first_pt );             // Start point of region, must be same as end point
+
+    for( RR_EDGE& rr_edge: rr_outline )
+    {
+        if( aCornerRadius )     // Guard: ensure we do not create arcs with radius = 0
+        {
+            // LineTo( rr_edge.m_end ); // made in plotArc()
+            plotArc( rr_edge.m_center,
+                     rr_edge.m_arc_angle_start, rr_edge.m_arc_angle_start+arc_angle,
+                     aCornerRadius, true );
+        }
+        else
+            LineTo( rr_edge.m_end );
+    }
+
+    fputs( "G37*\n", outputFile );      // Close region
+}
+
+
 void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize,
                                     SHAPE_POLY_SET* aPolygons,
                                     EDA_DRAW_MODE_T aTraceMode, void* aData )

 {
-    // A Pad custom is plotted as polygon.
-
-    // A flashed circle @aPadPos is added (anchor pad)
-    // However, because the anchor pad can be circle or rect, we use only
-    // a circle not bigger than the rect.
-    // the main purpose is to print a flashed DCode as pad anchor
-    if( aTraceMode == FILLED )
-        FlashPadCircle( aPadPos, std::min( aSize.x, aSize.y ), aTraceMode, aData );
+    // A Pad custom is plotted as Gerber region.

    GBR_METADATA gbr_metadata;

    if( aData )
-    {
        gbr_metadata = *static_cast<GBR_METADATA*>( aData );
-        // If the pad is drawn on a copper layer,
-        // set attribute to GBR_APERTURE_ATTRIB_CONDUCTOR
-        if( gbr_metadata.IsCopper() )
-            gbr_metadata.SetApertureAttrib( GBR_APERTURE_METADATA::GBR_APERTURE_ATTRIB_CONDUCTOR );
-
-        wxString attrname( ".P" );
-        gbr_metadata.m_NetlistMetadata.ClearAttribute( &attrname );   // not allowed on inner layers
-    }

    SHAPE_POLY_SET polyshape = *aPolygons;

@@ -921,9 +1073,10 @@ void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
        // Close polygon
        cornerList.push_back( cornerList[0] );

-        PlotPoly( cornerList,
-                  aTraceMode == FILLED ? FILLED_SHAPE : NO_FILL,
-                  aTraceMode == FILLED ? 0 : GetCurrentLineWidth(), &gbr_metadata );
+        if( aTraceMode == SKETCH )
+            PlotPoly( cornerList, NO_FILL, GetCurrentLineWidth(), &gbr_metadata );
+        else
+            PlotGerberRegion( cornerList, &gbr_metadata );
    }
 }

@@ -941,25 +1094,6 @@ void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos,  const wxPoint* aCo
    for( int ii = 0; ii < 4; ii++ )
        cornerList.push_back( aCorners[ii] );

-    // Now, flash a pad anchor, if a netlist attribute is set
-    // (remove me when a Aperture macro will be used)
-    if( aData && ( aTrace_Mode == FILLED ) )
-    {
-        // Calculate the radius of the circle inside the shape
-        // It is the smaller dist from shape pos to edges
-        int radius = INT_MAX;
-
-        for( unsigned ii = 0, jj = cornerList.size()-1; ii < cornerList.size();
-             jj = ii, ii++ )
-        {
-            SEG segment( aCorners[ii], aCorners[jj] );
-            int dist = segment.LineDistance( VECTOR2I( 0, 0) );
-            radius = std::min( radius, dist );
-        }
-
-        FlashPadCircle( aPadPos, radius*2, aTrace_Mode, aData );
-    }
-
    // Draw the polygon and fill the interior as required
    for( unsigned ii = 0; ii < 4; ii++ )
    {
@@ -974,21 +1108,12 @@ void GERBER_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos,  const wxPoint* aCo
    GBR_METADATA metadata;

    if( gbr_metadata )
-    {
        metadata = *gbr_metadata;
-        // If the pad is drawn on a copper layer,
-        // set attribute to GBR_APERTURE_ATTRIB_CONDUCTOR
-        if( metadata.IsCopper() )
-            metadata.SetApertureAttrib( GBR_APERTURE_METADATA::GBR_APERTURE_ATTRIB_CONDUCTOR );

-        wxString attrname( ".P" );
-        metadata.m_NetlistMetadata.ClearAttribute( &attrname );   // not allowed on inner layers
-    }
-
-    SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &metadata );
-    PlotPoly( cornerList, aTrace_Mode == FILLED ? FILLED_SHAPE : NO_FILL,
-              aTrace_Mode == FILLED ? 0 : GetCurrentLineWidth(),
-              &metadata );
+    if( aTrace_Mode == SKETCH )
+        PlotPoly( cornerList, NO_FILL, USE_DEFAULT_LINE_WIDTH, &metadata );
+    else
+        PlotGerberRegion( cornerList, &metadata );
 }


@@ -495,7 +495,7 @@ int PDF_PLOTTER::startPdfStream(int handle)
             "stream\n", handle + 1 );

    // Open a temporary file to accumulate the stream
-    workFilename = filename + wxT(".tmp");
+    workFilename = wxFileName::CreateTempFileName( "" );
    workFile = wxFopen( workFilename, wxT( "w+b" ));
    wxASSERT( workFile );
    return handle;
@@ -6,8 +6,8 @@
 /*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
- * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -90,6 +90,8 @@
 * flag_sweep : 0 = CCW, 1 = CW
 * The center of ellipse is automatically calculated.
 */
+
+#include <base64.h>
 #include <fctsys.h>
 #include <trigo.h>
 #include <eda_base_frame.h>
@@ -100,6 +102,8 @@
 #include <macros.h>
 #include <kicad_string.h>

+#include <cstdint>
+#include <wx/mstream.h>


 /**
@@ -424,9 +428,6 @@ void SVG_PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle, i
    if( StAngle > EndAngle )
        std::swap( StAngle, EndAngle );

-    setFillMode( fill );
-    SetCurrentLineWidth( width );
-
    // Calculate start point.
    DPOINT  centre_dev  = userToDeviceCoordinates( centre );
    double  radius_dev  = userToDeviceSize( radius );
@@ -487,7 +488,22 @@ void SVG_PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle, i
    // flag arc size (0 = small arc > 180 deg, 1 = large arc > 180 deg),
    // sweep arc ( 0 = CCW, 1 = CW),
    // end point
-    fprintf( outputFile, "<path d=\"M%g %g A%g %g 0.0 %d %d %g %g \" />\n",
+    if( fill != NO_FILL )
+    {
+        // Filled arcs (in eeschema) consist of the pie wedge and a stroke only on the arc
+        // This needs to be drawn in two steps.
+        setFillMode( fill );
+        SetCurrentLineWidth( 0 );
+
+        fprintf( outputFile, "<path d=\"M%g %g A%g %g 0.0 %d %d %g %g L %g %g Z\" />\n",
+                 start.x, start.y, radius_dev, radius_dev,
+                 flg_arc, flg_sweep,
+                 end.x, end.y, centre_dev.x, centre_dev.y  );
+    }
+
+    setFillMode( NO_FILL );
+    SetCurrentLineWidth( width );
+    fprintf( outputFile, "<path d=\"M%g %g A%g %g 0.0 %d %d %g %g\" />\n",
             start.x, start.y, radius_dev, radius_dev,
             flg_arc, flg_sweep,
             end.x, end.y  );
@@ -517,15 +533,22 @@ void SVG_PLOTTER::PlotPoly( const std::vector<wxPoint>& aCornerList,
    }

    DPOINT pos = userToDeviceCoordinates( aCornerList[0] );
-    fprintf( outputFile, "d=\"M %d,%d\n", (int) pos.x, (int) pos.y );
+    fprintf( outputFile, "d=\"M %g,%g\n", pos.x, pos.y );

-    for( unsigned ii = 1; ii < aCornerList.size(); ii++ )
+    for( unsigned ii = 1; ii < aCornerList.size() - 1; ii++ )
    {
        pos = userToDeviceCoordinates( aCornerList[ii] );
-        fprintf( outputFile, "%d,%d\n", (int) pos.x, (int) pos.y );
+        fprintf( outputFile, "%g,%g\n", pos.x, pos.y );
    }

-    fprintf( outputFile, "Z\" /> \n" );
+    // If the cornerlist ends where it begins, then close the poly
+    if( aCornerList.front() == aCornerList.back() )
+        fprintf( outputFile, "Z\" /> \n" );
+    else
+    {
+        pos = userToDeviceCoordinates( aCornerList.back() );
+        fprintf( outputFile, "%g,%g\n\" /> \n", pos.x, pos.y );
+    }
 }


@@ -535,12 +558,51 @@ void SVG_PLOTTER::PlotPoly( const std::vector<wxPoint>& aCornerList,
 void SVG_PLOTTER::PlotImage( const wxImage& aImage, const wxPoint& aPos,
                             double aScaleFactor )
 {
-    // in svg file we must insert a link to a png image file to plot an image
-    // the image itself is not included in the svg file.
-    // So we prefer skip the image, and just draw a rectangle,
-    // like other plotters which do not support images
+    wxSize pix_size( aImage.GetWidth(), aImage.GetHeight() );
+
+    // Requested size (in IUs)
+    DPOINT drawsize( aScaleFactor * pix_size.x,
+                     aScaleFactor * pix_size.y );
+
+    // calculate the bitmap start position
+    wxPoint start( aPos.x - drawsize.x / 2,
+                   aPos.y - drawsize.y / 2);
+
+    // Rectangles having a 0 size value for height or width are just not drawn on Inscape,
+    // so use a line when happens.
+    if( drawsize.x == 0.0 || drawsize.y == 0.0 )    // Draw a line
+    {
+        PLOTTER::PlotImage( aImage, aPos, aScaleFactor );
+    }
+    else
+    {
+        wxMemoryOutputStream img_stream;
+
+        aImage.SaveFile( img_stream, wxBITMAP_TYPE_PNG );
+        size_t input_len = img_stream.GetOutputStreamBuffer()->GetBufferSize();
+        std::vector<uint8_t> buffer( input_len );
+        std::vector<uint8_t> encoded;
+
+        img_stream.CopyTo( buffer.data(), buffer.size() );
+        base64::encode( buffer, encoded );
+
+        fprintf( outputFile,
+                 "<image x=\"%g\" y=\"%g\" xlink:href=\"data:image/png;base64,",
+                 userToDeviceSize( start.x ), userToDeviceSize( start.y )
+                 );
+
+        for( size_t i = 0; i < encoded.size(); i++ )
+        {
+            fprintf( outputFile, "%c", static_cast<char>( encoded[i] ) );
+
+            if( ( i % 64 )  == 63 )
+                fprintf( outputFile, "\n" );
+        }
+
+        fprintf( outputFile, "\"\npreserveAspectRatio=\"none\" width=\"%g\" height=\"%g\" />",
+                userToDeviceSize( drawsize.x ), userToDeviceSize( drawsize.y ) );
+    }

-    PLOTTER::PlotImage( aImage, aPos, aScaleFactor );

 }

@@ -601,7 +663,11 @@ bool SVG_PLOTTER::StartPlot()
        "<?xml version=\"1.0\" standalone=\"no\"?>\n",
        " <!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \n",
        " \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\"> \n",
-        "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" \n",
+        "<svg\n"
+        "  xmlns:svg=\"http://www.w3.org/2000/svg\"\n"
+        "  xmlns=\"http://www.w3.org/2000/svg\"\n",
+        "  xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n",
+        "  version=\"1.1\"\n",
        NULL
    };

@@ -614,7 +680,7 @@ bool SVG_PLOTTER::StartPlot()
    // Write viewport pos and size
    wxPoint origin;    // TODO set to actual value
    fprintf( outputFile,
-             "    width=\"%gcm\" height=\"%gcm\" viewBox=\"%d %d %d %d \">\n",
+             "  width=\"%fcm\" height=\"%fcm\" viewBox=\"%d %d %d %d\">\n",
             (double) paperSize.x / m_IUsPerDecimil * 2.54 / 10000,
             (double) paperSize.y / m_IUsPerDecimil * 2.54 / 10000,
             origin.x, origin.y,
@@ -641,7 +707,7 @@ bool SVG_PLOTTER::StartPlot()
             m_brush_rgb_color, opacity, m_pen_rgb_color, opacity );

    // output the pen cap and line joint
-    fputs( "stroke-linecap:round; stroke-linejoin:round; \"\n", outputFile );
+    fputs( "stroke-linecap:round; stroke-linejoin:round;\"\n", outputFile );
    fputs( " transform=\"translate(0 0) scale(1 1)\">\n", outputFile );
    return true;
 }
@@ -674,7 +740,76 @@ void SVG_PLOTTER::Text( const wxPoint&              aPos,
    SetColor( aColor );
    SetCurrentLineWidth( aWidth );

-    // TODO: see if the postscript native text code can be used in SVG plotter
+    int width = currentPenWidth;
+
+    if( aWidth <= 0 && aBold )
+        width = GetPenSizeForBold( std::min( aSize.x, aSize.y ) );
+
+    if( aWidth <= 0 )
+        width = currentPenWidth;
+
+    wxPoint text_pos = aPos;
+    const char *hjust = "start";
+
+    switch( aH_justify )
+    {
+    case GR_TEXT_HJUSTIFY_CENTER:
+        hjust = "middle";
+        break;
+
+    case GR_TEXT_HJUSTIFY_RIGHT:
+        hjust = "end";
+        break;
+
+    case GR_TEXT_HJUSTIFY_LEFT:
+        hjust = "start";
+        break;
+    }
+
+    switch( aV_justify )
+    {
+    case GR_TEXT_VJUSTIFY_CENTER:
+        text_pos.y += aSize.y / 2;
+        break;
+
+    case GR_TEXT_VJUSTIFY_TOP:
+        text_pos.y += aSize.y;
+        break;
+
+    case GR_TEXT_VJUSTIFY_BOTTOM:
+        break;
+    }
+
+    wxSize text_size;
+    // aSize.x or aSize.y is < 0 for mirrored texts.
+    // The actual text size value is the absolue value
+    text_size.x = std::abs( GraphicTextWidth( aText, aSize, aItalic, width ) );
+    text_size.y = std::abs( aSize.x * 4/3 ); // Hershey font height to em size conversion
+    DPOINT anchor_pos_dev = userToDeviceCoordinates( aPos );
+    DPOINT text_pos_dev = userToDeviceCoordinates( text_pos );
+    DPOINT sz_dev = userToDeviceSize( text_size );
+
+    if( aOrient != 0 ) {
+        fprintf( outputFile,
+                 "<g transform=\"rotate(%g %g %g)\">\n",
+                 - aOrient * 0.1, anchor_pos_dev.x, anchor_pos_dev.y );
+    }
+
+    fprintf( outputFile,
+             "<text x=\"%g\" y=\"%g\"\n", text_pos_dev.x, text_pos_dev.y );
+
+    /// If the text is mirrored, we should also mirror the hidden text to match
+    if( aSize.x < 0 )
+        fprintf( outputFile, "transform=\"scale(-1 1) translate(%f 0)\"\n", -2 * text_pos_dev.x );
+
+    fprintf( outputFile,
+             "textLength=\"%g\" font-size=\"%g\" lengthAdjust=\"spacingAndGlyphs\"\n"
+             "text-anchor=\"%s\" opacity=\"0\">%s</text>\n",
+             sz_dev.x, sz_dev.y,
+             hjust, TO_UTF8( XmlEsc( aText ) ) );
+
+    if( aOrient != 0 )
+        fputs( "</g>\n", outputFile );

    PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify,
                   aWidth, aItalic, aBold, aMultilineAllowed );
@@ -38,6 +38,7 @@
 */

 #include <fctsys.h>
+#include <vector>

 #include <trigo.h>
 #include <eda_base_frame.h>
@@ -164,7 +165,17 @@ void PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle, int r
    /* Please NOTE the different sign due to Y-axis flip */
    start.x = centre.x + KiROUND( cosdecideg( radius, -StAngle ) );
    start.y = centre.y + KiROUND( sindecideg( radius, -StAngle ) );
-    MoveTo( start );
+
+    if( fill != NO_FILL )
+    {
+        MoveTo( centre );
+        LineTo( start );
+    }
+    else
+    {
+        MoveTo( start );
+    }
+
    for( int ii = StAngle + delta; ii < EndAngle; ii += delta )
    {
        end.x = centre.x + KiROUND( cosdecideg( radius, -ii ) );
@@ -174,7 +185,16 @@ void PLOTTER::Arc( const wxPoint& centre, double StAngle, double EndAngle, int r

    end.x = centre.x + KiROUND( cosdecideg( radius, -EndAngle ) );
    end.y = centre.y + KiROUND( sindecideg( radius, -EndAngle ) );
-    FinishTo( end );
+
+    if( fill != NO_FILL )
+    {
+        LineTo( end );
+        FinishTo( centre );
+    }
+    else
+    {
+        FinishTo( end );
+    }
 }


@@ -458,9 +478,16 @@ void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width,
 {
    if( tracemode == FILLED )
    {
-        SetCurrentLineWidth( width );
-        MoveTo( start );
-        FinishTo( end );
+        if( start == end )
+        {
+            Circle( start, width, FILLED_SHAPE, 0 );
+        }
+        else
+        {
+            SetCurrentLineWidth( width );
+            MoveTo( start );
+            FinishTo( end );
+        }
    }
    else
    {
@@ -530,6 +557,9 @@ void PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aCornerList, FILL_T aFill,
    for( int ii = 0; ii < aCornerList.PointCount(); ii++ )
        cornerList.push_back( wxPoint( aCornerList.CPoint( ii ) ) );

+    if( aCornerList.IsClosed() && cornerList.front() != cornerList.back() )
+        cornerList.push_back( wxPoint( aCornerList.CPoint( 0 ) ) );
+
    PlotPoly( cornerList , aFill, aWidth, aData );
 }

@@ -20,6 +20,7 @@
 * or you may write to the Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
+#include <limits>

 #include <preview_items/polygon_geom_manager.h>

@@ -67,6 +68,7 @@ bool POLYGON_GEOM_MANAGER::AddPoint( const VECTOR2I& aPt )

 void POLYGON_GEOM_MANAGER::SetFinished()
 {
+
    m_client.OnComplete( *this );
 }

@@ -95,9 +97,9 @@ bool POLYGON_GEOM_MANAGER::IsSelfIntersecting( bool aIncludeLeaderPts ) const
 }


-void POLYGON_GEOM_MANAGER::SetCursorPosition( const VECTOR2I& aPos, LEADER_MODE aModifier )
+void POLYGON_GEOM_MANAGER::SetCursorPosition( const VECTOR2I& aPos )
 {
-    updateLeaderPoints( aPos, aModifier );
+    updateLeaderPoints( aPos );
 }


@@ -143,17 +145,58 @@ void POLYGON_GEOM_MANAGER::Reset()
 void POLYGON_GEOM_MANAGER::updateLeaderPoints( const VECTOR2I& aEndPoint, LEADER_MODE aModifier )
 {
    wxCHECK( m_lockedPoints.PointCount() > 0, /*void*/ );
-    const VECTOR2I& lastPt = m_lockedPoints.CLastPoint();
-    auto newEnd = VECTOR2I( aEndPoint );
+    const VECTOR2I& last_pt = m_lockedPoints.CLastPoint();

    if( m_leaderMode == LEADER_MODE::DEG45 || aModifier == LEADER_MODE::DEG45 )
    {
-        const VECTOR2I lineVector( aEndPoint - lastPt );
+        const VECTOR2I line_vec( aEndPoint - last_pt );
        // get a restricted 45/H/V line from the last fixed point to the cursor
-        newEnd = lastPt + GetVectorSnapped45( lineVector );
+        auto new_end = last_pt + GetVectorSnapped45( line_vec );
+        OPT_VECTOR2I pt;
+
+        if( m_lockedPoints.SegmentCount() > 1 )
+        {
+            const VECTOR2I& start_pt = m_lockedPoints.CPoint( 0 );
+            VECTOR2I completed_vec( start_pt - new_end );
+
+            if( completed_vec != GetVectorSnapped45( completed_vec ) )
+            {
+                SEG v_first( new_end, VECTOR2I( new_end.x, start_pt.y ) );
+                SEG h_first( new_end, VECTOR2I( start_pt.x, new_end.y ) );
+
+                SHAPE_LINE_CHAIN::INTERSECTIONS intersections;
+                auto v_hits = m_lockedPoints.Intersect( v_first, intersections );
+                v_hits += m_lockedPoints.Intersect( SEG( v_first.B, start_pt ), intersections );
+                pt = v_first.B;
+
+                if( v_hits > 0 )
+                {
+                    intersections.clear();
+                    auto h_hits = m_lockedPoints.Intersect( h_first, intersections );
+                    h_hits += m_lockedPoints.Intersect( SEG( h_first.B, start_pt ), intersections );
+
+                    if( h_hits < v_hits )
+                        pt = h_first.B;
+                }
+            }
+        }
+
+        m_leaderPts = SHAPE_LINE_CHAIN( last_pt, new_end );
+
+        if( pt )
+        {
+            // This checks for backtracking from the point to intersection
+            if( SEG( last_pt, new_end ).Collinear( SEG( new_end, *pt ) ) )
+                m_leaderPts = SHAPE_LINE_CHAIN( last_pt, *pt );
+            else
+                m_leaderPts.Append( *pt );
+        }
+    }
+    else
+    {
+        // direct segment
+        m_leaderPts = SHAPE_LINE_CHAIN( last_pt, aEndPoint );
    }

-    // direct segment
-    m_leaderPts = SHAPE_LINE_CHAIN( lastPt, newEnd );
    m_client.OnGeometryChange( *this );
 }
@@ -31,6 +31,7 @@

 using namespace KIGFX::PREVIEW;

+const double POLYGON_ITEM::POLY_LINE_WIDTH = 1;

 POLYGON_ITEM::POLYGON_ITEM():
        SIMPLE_OVERLAY_ITEM()
@@ -60,12 +61,14 @@ void POLYGON_ITEM::drawPreviewShape( KIGFX::VIEW* aView ) const
    auto& gal = *aView->GetGAL();
    auto rs = static_cast<KIGFX::PCB_RENDER_SETTINGS*>( aView->GetPainter()->GetSettings() );

+    gal.SetLineWidth( (float) aView->ToWorld( POLY_LINE_WIDTH ) );
    gal.DrawPolyline( m_lockedChain );
-    gal.DrawPolygon( m_polyfill );

    // draw the leader line in a different color
    gal.SetStrokeColor( rs->GetLayerColor( LAYER_AUX_ITEMS ) );
    gal.DrawPolyline( m_leaderChain );
+
+    gal.DrawPolygon( m_polyfill );
 }


@@ -40,6 +40,40 @@
 static const char illegalFileNameChars[] = "\\/:\"<>|";


+bool ConvertSmartQuotesAndDashes( wxString* aString )
+{
+    bool retVal = false;
+
+    for( wxString::iterator ii = aString->begin(); ii != aString->end(); ++ii )
+    {
+        if( *ii == L'\u0060' || *ii == L'\u00B4' || *ii == L'\u2018' || *ii == L'\u2019' )
+        {
+            *ii = '\'';
+            retVal = true;
+        }
+        if( *ii == L'\u201C' || *ii == L'\u201D' )
+        {
+            *ii = '"';
+            retVal = true;
+        }
+        if( *ii == L'\u2013' || *ii == L'\u2014' )
+        {
+            *ii = '-';
+            retVal = true;
+        }
+    }
+
+    return retVal;
+}
+
+
+/**
+ * These Escape/Unescape routines use HTML-entity-reference-style encoding to handle
+ * characters which are:
+ *   (a) not legal in filenames
+ *   (b) used as control characters in LIB_IDs
+ *   (c) used to delineate hierarchical paths
+ */
 wxString EscapeString( const wxString& aSource )
 {
 #if 1
@@ -209,8 +243,12 @@ int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize )
 }


-std::string EscapedUTF8( const wxString& aString )
+std::string EscapedUTF8( wxString aString )
 {
+    // No new-lines allowed in quoted strings
+    aString.Replace( "\r\n", "\r" );
+    aString.Replace( "\n", "\r" );
+
    std::string utf8 = TO_UTF8( aString );

    std::string ret;
@@ -34,6 +34,7 @@
 %include <std_map.i>
 %include <std_shared_ptr.i>
 %include <std_set.i>
+%include <stdint.i>

 %include "ki_exception.i"   // affects all that follow it

@@ -95,6 +96,7 @@ principle should be easily implemented by adapting the current STL containers.
    #include <marker_base.h>
    #include <eda_text.h>
    #include <convert_to_biu.h>
+    #include <build_version.h>
 %}

 // all the wx wrappers for wxString, wxPoint, wxRect, wxChar ..
@@ -115,6 +117,7 @@ principle should be easily implemented by adapting the current STL containers.
 %include colors_design_settings.h
 %include marker_base.h
 %include eda_text.h
+%include build_version.h

 // Cast time_t to known type for Python
 typedef long time_t;
@@ -1040,36 +1040,36 @@ __asm (
 # endif
 #endif
 "    # reserve space on stack\n"
-"    subi  %r1, %r1, 328\n"
+"    subi  %r1, %r1, 320\n"
 #if _CALL_ELF != 2
-"    std  %r2,  152(%r1)  # save TOC\n"
+"    std  %r2,  144(%r1)  # save TOC\n"
 #endif
-"    std  %r14, 160(%r1)  # save R14\n"
-"    std  %r15, 168(%r1)  # save R15\n"
-"    std  %r16, 176(%r1)  # save R16\n"
-"    std  %r17, 184(%r1)  # save R17\n"
-"    std  %r18, 192(%r1)  # save R18\n"
-"    std  %r19, 200(%r1)  # save R19\n"
-"    std  %r20, 208(%r1)  # save R20\n"
-"    std  %r21, 216(%r1)  # save R21\n"
-"    std  %r22, 224(%r1)  # save R22\n"
-"    std  %r23, 232(%r1)  # save R23\n"
-"    std  %r24, 240(%r1)  # save R24\n"
-"    std  %r25, 248(%r1)  # save R25\n"
-"    std  %r26, 256(%r1)  # save R26\n"
-"    std  %r27, 264(%r1)  # save R27\n"
-"    std  %r28, 272(%r1)  # save R28\n"
-"    std  %r29, 280(%r1)  # save R29\n"
-"    std  %r30, 288(%r1)  # save R30\n"
-"    std  %r31, 296(%r1)  # save R31\n"
+"    std  %r14, 152(%r1)  # save R14\n"
+"    std  %r15, 160(%r1)  # save R15\n"
+"    std  %r16, 168(%r1)  # save R16\n"
+"    std  %r17, 176(%r1)  # save R17\n"
+"    std  %r18, 184(%r1)  # save R18\n"
+"    std  %r19, 192(%r1)  # save R19\n"
+"    std  %r20, 200(%r1)  # save R20\n"
+"    std  %r21, 208(%r1)  # save R21\n"
+"    std  %r22, 216(%r1)  # save R22\n"
+"    std  %r23, 224(%r1)  # save R23\n"
+"    std  %r24, 232(%r1)  # save R24\n"
+"    std  %r25, 240(%r1)  # save R25\n"
+"    std  %r26, 248(%r1)  # save R26\n"
+"    std  %r27, 256(%r1)  # save R27\n"
+"    std  %r28, 264(%r1)  # save R28\n"
+"    std  %r29, 272(%r1)  # save R29\n"
+"    std  %r30, 280(%r1)  # save R30\n"
+"    std  %r31, 288(%r1)  # save R31\n"
 "    # save CR\n"
 "    mfcr  %r0\n"
-"    std  %r0, 304(%r1)\n"
+"    std  %r0, 296(%r1)\n"
 "    # save LR\n"
 "    mflr  %r0\n"
-"    std  %r0, 312(%r1)\n"
+"    std  %r0, 304(%r1)\n"
 "    # save LR as PC\n"
-"    std  %r0, 320(%r1)\n"
+"    std  %r0, 312(%r1)\n"
 "    # test if fpu env should be preserved\n"
 "    cmpwi  cr7, %r6, 0\n"
 "    beq  cr7, 1f\n"
@@ -1091,8 +1091,6 @@ __asm (
 "    stfd  %f29, 120(%r1)  # save F29\n"
 "    stfd  %f30, 128(%r1)  # save F30\n"
 "    stfd  %f31, 136(%r1)  # save F31\n"
-"    mffs  %f0  # load FPSCR\n"
-"    stfd  %f0, 144(%r1)  # save FPSCR\n"
 "1:\n"
 "    # store RSP (pointing to context-data) in R3\n"
 "    std  %r1, 0(%r3)\n"
@@ -1119,42 +1117,40 @@ __asm (
 "    lfd  %f29, 120(%r1)  # restore F29\n"
 "    lfd  %f30, 128(%r1)  # restore F30\n"
 "    lfd  %f31, 136(%r1)  # restore F31\n"
-"    lfd  %f0,  144(%r1)  # load FPSCR\n"
-"    mtfsf  0xff, %f0  # restore FPSCR\n"
 "2:\n"
 #if _CALL_ELF != 2
-"    ld  %r2,  152(%r1)  # restore TOC\n"
+"    ld  %r2,  144(%r1)  # restore TOC\n"
 #endif
-"    ld  %r14, 160(%r1)  # restore R14\n"
-"    ld  %r15, 168(%r1)  # restore R15\n"
-"    ld  %r16, 176(%r1)  # restore R16\n"
-"    ld  %r17, 184(%r1)  # restore R17\n"
-"    ld  %r18, 192(%r1)  # restore R18\n"
-"    ld  %r19, 200(%r1)  # restore R19\n"
-"    ld  %r20, 208(%r1)  # restore R20\n"
-"    ld  %r21, 216(%r1)  # restore R21\n"
-"    ld  %r22, 224(%r1)  # restore R22\n"
-"    ld  %r23, 232(%r1)  # restore R23\n"
-"    ld  %r24, 240(%r1)  # restore R24\n"
-"    ld  %r25, 248(%r1)  # restore R25\n"
-"    ld  %r26, 256(%r1)  # restore R26\n"
-"    ld  %r27, 264(%r1)  # restore R27\n"
-"    ld  %r28, 272(%r1)  # restore R28\n"
-"    ld  %r29, 280(%r1)  # restore R29\n"
-"    ld  %r30, 288(%r1)  # restore R30\n"
-"    ld  %r31, 296(%r1)  # restore R31\n"
+"    ld  %r14, 152(%r1)  # restore R14\n"
+"    ld  %r15, 160(%r1)  # restore R15\n"
+"    ld  %r16, 168(%r1)  # restore R16\n"
+"    ld  %r17, 176(%r1)  # restore R17\n"
+"    ld  %r18, 184(%r1)  # restore R18\n"
+"    ld  %r19, 192(%r1)  # restore R19\n"
+"    ld  %r20, 200(%r1)  # restore R20\n"
+"    ld  %r21, 208(%r1)  # restore R21\n"
+"    ld  %r22, 216(%r1)  # restore R22\n"
+"    ld  %r23, 224(%r1)  # restore R23\n"
+"    ld  %r24, 232(%r1)  # restore R24\n"
+"    ld  %r25, 240(%r1)  # restore R25\n"
+"    ld  %r26, 248(%r1)  # restore R26\n"
+"    ld  %r27, 256(%r1)  # restore R27\n"
+"    ld  %r28, 264(%r1)  # restore R28\n"
+"    ld  %r29, 272(%r1)  # restore R29\n"
+"    ld  %r30, 280(%r1)  # restore R30\n"
+"    ld  %r31, 288(%r1)  # restore R31\n"
 "    # restore CR\n"
-"    ld  %r0, 304(%r1)\n"
+"    ld  %r0, 296(%r1)\n"
 "    mtcr  %r0\n"
 "    # restore LR\n"
-"    ld  %r0, 312(%r1)\n"
+"    ld  %r0, 304(%r1)\n"
 "    mtlr  %r0\n"
 "    # load PC\n"
-"    ld  %r12, 320(%r1)\n"
+"    ld  %r12, 312(%r1)\n"
 "    # restore CTR\n"
 "    mtctr  %r12\n"
 "    # adjust stack\n"
-"    addi  %r1, %r1, 328\n"
+"    addi  %r1, %r1, 320\n"
 "    # use third arg as return value after jump\n"
 "    # use third arg as first arg in context function\n"
 "    mr  %r3, %r5\n"
@@ -1212,19 +1208,19 @@ __asm (
 "    clrrdi  %r3, %r3, 4\n"
 "    # reserve space for context-data on context-stack\n"
 "    # including 64 byte of linkage + parameter area (R1 % 16 == 0)\n"
-"    subi  %r3, %r3, 392\n"
+"    subi  %r3, %r3, 384\n"
 "    # third arg of make_fcontext() == address of context-function\n"
 "    # entry point (ELFv2) or descriptor (ELFv1)\n"
 #if _CALL_ELF == 2
 "    # save address of context-function entry point\n"
-"    std  %r5, 320(%r3)\n"
+"    std  %r5, 312(%r3)\n"
 #else
 "    # save address of context-function entry point\n"
 "    ld   %r4, 0(%r5)\n"
-"    std  %r4, 320(%r3)\n"
+"    std  %r4, 312(%r3)\n"
 "    # save TOC of context-function\n"
 "    ld   %r4, 8(%r5)\n"
-"    std  %r4, 152(%r3)\n"
+"    std  %r4, 144(%r3)\n"
 #endif
 "    # load LR\n"
 "    mflr  %r0\n"
@@ -1239,7 +1235,7 @@ __asm (
 "    mtlr  %r0\n"
 "    # save address of finish as return-address for context-function\n"
 "    # will be entered after context-function returns\n"
-"    std  %r4, 312(%r3)\n"
+"    std  %r4, 304(%r3)\n"
 "    # restore return address from R6\n"
 "    mtlr  %r6\n"
 "    blr  # return pointer to context-data\n"
@@ -1526,7 +1526,7 @@ bool VIEW::IsVisible( const VIEW_ITEM* aItem ) const
 {
    const auto viewData = aItem->viewPrivData();

-    return viewData->m_flags & VISIBLE;
+    return viewData && ( viewData->m_flags & VISIBLE );
 }


@@ -326,10 +326,8 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
            return;
        }

-#if wxCHECK_VERSION( 3, 0, 0 )
        if( !m_parentPanel->HasFocus() )
            break;
-#endif

        double borderSize = std::min( m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().x,
                                      m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().y );
@@ -626,16 +624,9 @@ void WX_VIEW_CONTROLS::refreshMouse()
    moveEvent.SetY( msp.y );

    // Set the modifiers state
-#if wxCHECK_VERSION( 3, 0, 0 )
    moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) );
    moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) );
    moveEvent.SetAltDown( wxGetKeyState( WXK_ALT ) );
-#else
-    // wx <3.0 do not have accessors, but the fields are exposed
-    moveEvent.m_controlDown = wxGetKeyState( WXK_CONTROL );
-    moveEvent.m_shiftDown = wxGetKeyState( WXK_SHIFT );
-    moveEvent.m_altDown = wxGetKeyState( WXK_ALT );
-#endif

    m_cursorPos = m_view->ToWorld( VECTOR2D( msp.x, msp.y ) );
    wxPostEvent( m_parentPanel, moveEvent );
@@ -660,30 +651,28 @@ void WX_VIEW_CONTROLS::UpdateScrollbars()
    VECTOR2I newScroll( ( viewport.Centre().x - boundary.GetLeft() ) * m_scrollScale.x,
                ( viewport.Centre().y - boundary.GetTop() ) * m_scrollScale.y );

+    // We add the width of the scroll bar thumb to the range because the scroll range is given by
+    // the full bar while the position is given by the left/top position of the thumb
+    VECTOR2I newRange( m_scrollScale.x * boundary.GetWidth() + m_parentPanel->GetScrollThumb( wxSB_HORIZONTAL ),
+            m_scrollScale.y * boundary.GetHeight() + m_parentPanel->GetScrollThumb( wxSB_VERTICAL ) );
+
    // Flip scroll direction in flipped view
    if( m_view->IsMirroredX() )
        newScroll.x = ( boundary.GetRight() - viewport.Centre().x ) * m_scrollScale.x;

-    // Adjust scrollbars only if it is needed. Otherwise there are cases when canvas is continuosly
+    // Adjust scrollbars only if it is needed. Otherwise there are cases when canvas is continuously
    // refreshed (Windows)
-    if( m_scrollPos != newScroll )
+    if( m_scrollPos != newScroll || newRange.x != m_parentPanel->GetScrollRange( wxSB_HORIZONTAL )
+            || newRange.y != m_parentPanel->GetScrollRange( wxSB_VERTICAL ) )
    {
-        // Another example of wxWidgets being broken by design: scroll position is determined by the
-        // left (or top, if vertical) edge of the slider. Fortunately, slider size seems to be constant
-        // (at least for wxGTK and wxMSW), so we have to add its size to allow user to scroll the workspace
-        // till the end.
-
-        m_parentPanel->SetScrollbars( 1, 1,
-#if defined(__LINUX__)
-            m_scrollScale.x * boundary.GetWidth() + 1623, m_scrollScale.y * boundary.GetHeight() + 1623,
-#elif defined(__WIN32__) || defined(__WIN64__)
-            m_scrollScale.x * boundary.GetWidth() + 1377, m_scrollScale.y * boundary.GetHeight() + 741,
-#else
-            m_scrollScale.x * boundary.GetWidth(), m_scrollScale.y * boundary.GetHeight(),
-#endif
-            newScroll.x, newScroll.y, false );
-
+        m_parentPanel->SetScrollbars( 1, 1, newRange.x, newRange.y, newScroll.x, newScroll.y, true );
        m_scrollPos = newScroll;
+
+#ifndef __APPLE__
+        // Trigger a mouse refresh to get the canvas update in GTK (re-draws the scrollbars).
+        // Note that this causes an infinite loop on OSX as it generates a paint event.
+        refreshMouse();
+#endif
    }
 }

@@ -79,6 +79,10 @@ void GRID_CELL_COMBOBOX::BeginEdit( int aRow, int aCol, wxGrid* aGrid )
    // Don't immediately end if we get a kill focus event within BeginEdit
    evtHandler->SetInSetFocus( true );

+    // These event handlers are needed to properly dismiss the editor when the popup is closed
+    m_control->Bind(wxEVT_COMBOBOX_DROPDOWN, &GRID_CELL_COMBOBOX::onComboDropDown, this);
+    m_control->Bind(wxEVT_COMBOBOX_CLOSEUP, &GRID_CELL_COMBOBOX::onComboCloseUp, this);
+
    m_value = aGrid->GetTable()->GetValue( aRow, aCol );

    Combo()->SetFocus();
@@ -126,3 +130,24 @@ void GRID_CELL_COMBOBOX::Reset()
 }


+void GRID_CELL_COMBOBOX::onComboDropDown( wxCommandEvent& aEvent )
+{
+    auto evtHandler = static_cast<wxGridCellEditorEvtHandler*>( m_control->GetEventHandler() );
+
+    // Once the combobox is dropped, reset the flag to allow the focus-loss handler
+    // to function and close the editor.
+    evtHandler->SetInSetFocus( false );
+}
+
+
+void GRID_CELL_COMBOBOX::onComboCloseUp( wxCommandEvent& aEvent )
+{
+    auto evtHandler = static_cast<wxGridCellEditorEvtHandler*>( m_control->GetEventHandler() );
+
+    // Forward the combobox close up event to the cell event handler as a focus kill event
+    // so that the grid editor is dismissed when the combox closes, otherwise it leaves the
+    // dropdown arrow visible in the cell.
+    wxFocusEvent event( wxEVT_KILL_FOCUS, m_control->GetId() );
+    event.SetEventObject( m_control );
+    evtHandler->ProcessEvent( event );
+}
@@ -124,8 +124,10 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, LIB_TABLE* aLibTable, LIB_TREE_MODEL_ADAP
    {
        m_query_ctrl->SetHint( _( "Filter" ) );
        m_query_ctrl->SetFocus();
-        m_query_ctrl->SetValue( wxEmptyString );    // SetValue() is required here to kick off
-                                                    // initial sorting and pre-selection.
+        m_query_ctrl->SetValue( wxEmptyString );
+
+        // Force an update of the adapter with the empty text to ensure preselect is done
+        Regenerate( false );
    }

    // There may be a part preselected in the model. Make sure it is displayed.
@@ -696,9 +696,20 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
        }
        else
        {
-            wxCoord x0, y0;
-            bool first = true;
+            int count = 0;
+            int x0=0;               // X position of merged current vertical line
+            int ymin0=0;            // y min coord of merged current vertical line
+            int ymax0=0;            // y max coord of merged current vertical line
+            int dupx0 = 0;          // count of currently merged vertical lines
+            wxPoint line_start;     // starting point of the current line to draw

+            // Note: we do not use dc.DrawLines(), because at least on Windows
+            // dc.DrawLine() is faster, and dc.DrawLines() can hang for a lot
+            // (> 10000 points) (can happens when a lot of points is calculated)
+            // To avoid long draw time (and perhaps hanging) one plot only not redundant lines.
+            // To avoid artifacts when skipping points to the same x coordinate, for each
+            // group of points at a give, x coordinate we also draw a vertical line at this coord,
+            // from the ymin to the ymax vertical coordinates of skipped points
            while( GetNextXY( x, y ) )
            {
                double px = m_scaleX->TransformToPlot( x );
@@ -707,26 +718,34 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
                wxCoord x1 = w.x2p( px );
                wxCoord y1 = w.y2p( py );

-                if( first )
+                // Plot only points on the drawing area, to speed up the drawing time
+                if( x1 >= startPx && x1 <= endPx )
                {
-                    first = false;
-                    x0 = x1;
-                    y0 = y1;
-                    continue;
+                    if( !count || line_start.x != x1 )
+                    {
+                        if( dupx0 > 1 ) // Vertical points are merged,
+                                        // draw the pending vertical line
+                            dc.DrawLine( x0, ymin0, x0, ymax0 );
+
+                        x0 = x1;
+                        ymin0 = ymax0 = y1;
+                        dupx0 = 0;
+
+                        if( count )
+                            dc.DrawLine( line_start, wxPoint( x1, y1 ) );
+
+                        line_start.x = x1;
+                        line_start.y = y1;
+                        count++;
+                    }
+                    else
+                    {
+                        // "Merge" points on a vertical line at x0:
+                        ymin0 = std::min( ymin0, y1 );
+                        ymax0 = std::max( ymax0, y1 );
+                        dupx0++;
+                    }
                }
-
-                if( x0 == x1 )      // continue until a new X coordinate is reached
-                    continue;
-
-                bool outDown = ( y0 > maxYpx ) && ( y1 > maxYpx );
-                bool outUp = ( y0 < minYpx ) && ( y1 < minYpx );
-                bool outLeft = ( x1 < startPx ) && ( x0 < startPx );
-                bool outRight = ( x1 > endPx ) && ( x0 > endPx );
-                if( !( outUp || outDown || outLeft || outRight ) )
-                    dc.DrawLine( x0, y0, x1, y1 );
-
-                x0 = x1;
-                y0 = y1;
            }
        }

@@ -2168,9 +2187,11 @@ void mpWindow::AdjustLimitedView()
    if( !m_enableLimitedView )
        return;

+    // m_min and m_max are plot limits for curves
+    // xMin, xMax, yMin, yMax are the full limits (plot limit + margin)
    const double    xMin    = m_minX - m_marginLeft / m_scaleX;
-    const double    xMax    = m_maxX - m_marginRight / m_scaleX;
-    const double    yMin    = m_minY + m_marginTop / m_scaleY;
+    const double    xMax    = m_maxX + m_marginRight / m_scaleX;
+    const double    yMin    = m_minY - m_marginTop / m_scaleY;
    const double    yMax    = m_maxY + m_marginBottom / m_scaleY;

    if( m_desiredXmin < xMin )
@@ -114,7 +114,6 @@ WX_PROGRESS_REPORTER::WX_PROGRESS_REPORTER( wxWindow* aParent, const wxString& a

 WX_PROGRESS_REPORTER::~WX_PROGRESS_REPORTER()
 {
-    Destroy();
 }


@@ -22,6 +22,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

+#include <wx/clipbrd.h>
 #include <wx/stattext.h>
 #include <wx/textentry.h>
 #include <limits>
@@ -46,6 +47,8 @@ UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
    m_useMils = aUseMils;
    m_allowEval = allowEval && dynamic_cast<wxTextEntry*>( m_value );
    m_needsEval = false;
+    m_selStart = 0;
+    m_selEnd = 0;

    auto textEntry = dynamic_cast<wxTextEntry*>( m_value );
    if( textEntry )
@@ -79,7 +82,10 @@ void UNIT_BINDER::onSetFocus( wxFocusEvent& aEvent )
        wxString oldStr = m_eval.OriginalText();

        if( oldStr.length() )
+        {
            textEntry->SetValue( oldStr );
+            textEntry->SetSelection( m_selStart, m_selEnd );
+        }

        m_needsEval = true;
    }
@@ -95,8 +101,25 @@ void UNIT_BINDER::onKillFocus( wxFocusEvent& aEvent )
    if( m_allowEval && textEntry )
    {
        if( m_eval.Process( textEntry->GetValue() ) )
+        {
+            textEntry->GetSelection( &m_selStart, &m_selEnd );
+            wxString sel = textEntry->GetStringSelection();
+
            textEntry->ChangeValue( m_eval.Result() );

+#ifdef __WXGTK__
+            // Manually copy the selected text to the primary selection clipboard
+            if( wxTheClipboard->Open() )
+            {
+                bool clipTarget = wxTheClipboard->IsUsingPrimarySelection();
+                wxTheClipboard->UsePrimarySelection( true );
+                wxTheClipboard->SetData( new wxTextDataObject( sel ) );
+                wxTheClipboard->UsePrimarySelection( clipTarget );
+                wxTheClipboard->Close();
+            }
+#endif
+        }
+
        m_needsEval = false;
    }

@@ -599,12 +599,10 @@ void WIDGET_HOTKEY_LIST::initializeElements()

    // Add the bitmap image for invalid hotkey warning
    // bitmap size is not know (depending on it is built). So get it:
-    wxSize iconsize;
-    wxBitmap bm_invalid = KiBitmap( cancel_xpm );
-    iconsize.x = bm_invalid.GetWidth();
-    iconsize.y = bm_invalid.GetHeight();
-    m_imgList = new wxImageList( iconsize.x, iconsize.y, true, 1);
-    m_imgList->Add( bm_invalid );
+    wxIcon icon;
+    icon.CopyFromBitmap( KiBitmap( cancel_xpm ) );
+    m_imgList = new wxImageList( icon.GetSize().x, icon.GetSize().y, true, 1 );
+    m_imgList->Add( icon );
    AssignImageList( m_imgList );

    if( !m_readOnly )
@@ -148,7 +148,12 @@ void WX_GRID::DrawColLabel( wxDC& dc, int col )

    // It is reported that we need to erase the background to avoid display
    // artefacts, see #12055.
+    // wxWidgets renamed this variable between 3.1.2 and 3.1.3 ...
+#if wxCHECK_VERSION( 3, 1, 3 )
+    wxDCBrushChanger setBrush( dc, m_colLabelWin->GetBackgroundColour() );
+#else
    wxDCBrushChanger setBrush( dc, m_colWindow->GetBackgroundColour() );
+#endif
    dc.DrawRectangle(rect);

    rend.DrawBorder( *this, dc, rect );
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
 * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -27,9 +27,34 @@
 * @file wildcards_and_files_ext.cpp
 * Definition of file extensions used in Kicad.
 */
+#include <regex>
 #include <wildcards_and_files_ext.h>


+bool compareFileExtensions( const std::string& aExtension,
+        const std::vector<std::string>& aReference, bool aCaseSensitive )
+{
+    // Form the regular expression string by placing all possible extensions into it as alternatives
+    std::string regexString = "(";
+    bool        first = true;
+    for( auto ext : aReference )
+    {
+        // The | separate goes between the extensions
+        if( !first )
+            regexString += "|";
+        else
+            first = false;
+
+        regexString += ext;
+    }
+    regexString += ")";
+
+    // Create the regex and see if it matches
+    std::regex extRegex( regexString, aCaseSensitive ? std::regex::ECMAScript : std::regex::icase );
+    return std::regex_match( aExtension, extRegex );
+}
+
+
 wxString formatWildcardExt( const wxString& aWildcard )
 {
    wxString wc;
@@ -91,7 +116,6 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts )

 const std::string SchematicSymbolFileExtension( "sym" );
 const std::string SchematicLibraryFileExtension( "lib" );
-const std::string SchematicBackupFileExtension( "bak" );

 const std::string VrmlFileExtension( "wrl" );

@@ -60,77 +60,6 @@ else()
 endif()


-if( false )
-    # setup bundle
-    set( CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns )
-    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns" PROPERTIES
-        MACOSX_PACKAGE_LOCATION Resources
-        )
-    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns" PROPERTIES
-        MACOSX_PACKAGE_LOCATION Resources
-        )
-    set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
-    set( MACOSX_BUNDLE_NAME cvpcb )
-endif()
-
-
-if( false ) # no CVPCB exe any more, only the *.kiface
-    add_executable( cvpcb WIN32 MACOSX_BUNDLE
-        ../common/single_top.cpp
-        ../common/pgm_base.cpp
-        ${CVPCB_RESOURCES}
-        )
-    set_source_files_properties( ../common/single_top.cpp PROPERTIES
-        COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CVPCB;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL"
-        )
-    target_link_libraries( cvpcb
-        #singletop  # replaces common, giving us restrictive control and link warnings.
-        # There's way too much crap coming in from common yet.
-        common
-        ${wxWidgets_LIBRARIES}
-        )
-    if( MAKE_LINK_MAPS )
-        set_target_properties( cvpcb PROPERTIES
-            LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
-    endif()
-
-    if( APPLE )
-        include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-        configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist @ONLY )
-
-        set_target_properties( cvpcb PROPERTIES
-            MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
-            )
-
-        # put individual bundle outside of main bundle as a first step
-        # will be pulled into the main bundle when creating main bundle
-        install( TARGETS cvpcb
-            DESTINATION ${KICAD_BIN}
-            COMPONENT binary
-            )
-        install( CODE "
-                # override default embedded path settings
-                ${OSX_BUNDLE_OVERRIDE_PATHS}
-
-                # do all the work
-                include( BundleUtilities )
-                fixup_bundle( ${KICAD_BIN}/cvpcb.app/Contents/MacOS/cvpcb
-                    \"\"
-                    \"\"
-                    )
-                " COMPONENT Runtime
-            )
-    else()
-        install( TARGETS cvpcb
-            DESTINATION ${KICAD_BIN}
-            COMPONENT binary
-            )
-    endif()
-
-endif() # no CVPCB exe
-
-
 # the main cvpcb program, in DSO form.
 add_library( cvpcb_kiface MODULE
    cvpcb.cpp
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeIconFile</key>
-			<string>cvpcb_doc.icns</string>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>net</string>
-				<string>cmp</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>cvpcb document</string>
-			<key>LSHandlerRank</key>
-			<string>Owner</string>
-		</dict>
-	</array>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>cvpcb</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string>cvpcb.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.kicad-pcb.cvpcb</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-    <string>@KICAD_VERSION_FULL@</string>
-	<key>CFBundleName</key>
-	<string>CvPcb</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@KICAD_VERSION@</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>@KICAD_VERSION_FULL@</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-        <key>NSHighResolutionCapable</key>
-        <string>True</string>
-</dict>
-</plist>
--- a/Show More
+++ b/Show More