Commit new icons from Fabrizio Tappero .

(With a minor change for icon_cvpcb.svg: better look on dark backgrounds)
Fix bug 668200.

bitmaps_png/sources/icon_cvpcb_small.svg

@@ -13,7 +13,7 @@
    version="1.1"
    id="svg2"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="icon_cvpcb.svg">
+   sodipodi:docname="icon_cvpcb_small.svg">
   <metadata
      id="metadata107">
     <rdf:RDF>
@@ -41,9 +41,9 @@
      showgrid="true"
      inkscape:snap-grids="false"
      inkscape:snap-to-guides="false"
-     inkscape:zoom="4.9166668"
-     inkscape:cx="53.730959"
-     inkscape:cy="-7.1623682"
+     inkscape:zoom="13.906434"
+     inkscape:cx="10.431619"
+     inkscape:cy="4.4129107"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1"
@@ -120,7 +120,7 @@
     </radialGradient>
   </defs>
   <rect
-     style="opacity:0.80487819999999999;fill:none;stroke:#c06105;stroke-width:0.96729129999999997;stroke-opacity:0.95294118;fill-opacity:0.95294118000000005"
+     style="opacity:0.80487819999999999;fill:none;stroke:#f4972b;stroke-width:0.96729129999999997;stroke-opacity:0.98431373;fill-opacity:0.95294118000000005"
      id="rect2962"
      width="25.049658"
      height="25.019873"

bitmaps_png/sources/plot.svg

@@ -22,6 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -40,9 +41,9 @@
      showgrid="true"
      inkscape:snap-grids="false"
      inkscape:snap-to-guides="false"
-     inkscape:zoom="1.6666667"
-     inkscape:cx="-40.660327"
-     inkscape:cy="94.528601"
+     inkscape:zoom="6.6666668"
+     inkscape:cx="7.4854788"
+     inkscape:cy="4.8205635"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1"
@@ -57,13 +58,6 @@
   </sodipodi:namedview>
   <defs
      id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 13 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="26 : 13 : 1"
-       inkscape:persp3d-origin="13 : 8.6666667 : 1"
-       id="perspective55" />
     <linearGradient
        id="linearGradient7612">
       <stop
@@ -322,15 +316,15 @@
      width="12.0375" />
   <text
      xml:space="preserve"
-     style="font-size:18.68961334000000107px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#c17116;fill-opacity:1;stroke:none;font-family:Sans"
-     x="-0.58988637"
-     y="14.533866"
+     style="font-size:19.04494285999999903px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#168dc1;fill-opacity:1;stroke:#fdf8f1;stroke-width:1.01899998999999997;stroke-opacity:1;font-family:Sans;stroke-miterlimit:4;stroke-dasharray:none"
+     x="-1.1046221"
+     y="14.35789"
      id="text3097"
      sodipodi:linespacing="125%"
-     transform="scale(0.88929316,1.1244886)"><tspan
+     transform="scale(0.87103774,1.1480559)"><tspan
        sodipodi:role="line"
        id="tspan3099"
-       x="-0.58988637"
-       y="14.533866"
-       style="font-weight:bold;stroke:none;-inkscape-font-specification:Sans Bold;fill:#c17116;fill-opacity:1">P</tspan></text>
+       x="-1.1046221"
+       y="14.35789"
+       style="font-weight:bold;fill:#168dc1;fill-opacity:1;stroke:#fdf8f1;stroke-width:1.01899998999999997;stroke-opacity:1;-inkscape-font-specification:Sans Bold;stroke-miterlimit:4;stroke-dasharray:none">P</tspan></text>
 </svg>

eeschema/sch_text.cpp

@@ -415,19 +415,27 @@ bool SCH_TEXT::Save( FILE* aFile ) const
     if( m_Italic )
         shape = "Italic";
 
+    // For compatibility reason, the text must be saved in only one text line
+    // so we replace all E.O.L. by \\n
     wxString text = m_Text;
 
-    for( ; ; )
-    {
-        int i = text.find( '\n' );
-
-        if( i == wxNOT_FOUND )
-            break;
+    text.Replace( wxT("\n"), wxT( "\\n" ) );
 
-        text.erase( i, 1 );
-        text.insert( i, wxT( "\\n" ) );
+    // Here we should have no CR or LF character in line
+    // This is not always the case if a multiline text was copied (using a copy/paste function)
+    // from a text that uses E.O.L characters that differs from the current EOL format
+    // This is mainly the case under Linux using LF symbol when copying a text from
+    // Windows (using CRLF symbol)
+    // So we must just remove the extra CR left (or LF left under MacOSX)
+    for( unsigned ii = 0; ii < text.Len();  )
+    {
+        if( text[ii] == 0x0A || text[ii] == 0x0D )
+            text.erase( ii, 1 );
+        else
+            ii++;
     }
 
+
     if( fprintf( aFile, "Text Notes %-4d %-4d %-4d %-4d %s %d\n%s\n",
                  m_Pos.x, m_Pos.y, m_SchematicOrientation, m_Size.x,
                  shape, m_Thickness, TO_UTF8( text ) ) == EOF )