Commit 5a5b9098 authored by Andrey Fedorushkov's avatar Andrey Fedorushkov
Browse files

all: new Russian GOST patch - author Konstantin Baranovskiy 

pcbnew: fix print format in THROW_IO_ERROR
        fix properties file export_vrml.cpp
parent e90fc3a9

common/common_plot_functions.cpp

+505 −248

File changed.

Preview size limit exceeded, changes collapsed.

common/dialogs/dialog_page_settings.cpp

+9 −1
Original line number Diff line number Diff line
@@ -609,12 +609,20 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample() 
        wxPoint pointLeftTop( pageDUMMY.GetLeftMarginMils(), pageDUMMY.GetTopMarginMils() );

        wxPoint pointRightBottom( pageDUMMY.GetRightMarginMils(), pageDUMMY.GetBottomMarginMils() );



        // Get page type

        int idx = m_paperSizeComboBox->GetSelection();



        if( idx < 0 )

            idx = 0;



        wxString paperType = m_pageFmt[idx].Left( m_pageFmt[idx].Index( wxT( " " ) ) );



        // Draw layout preview.

        wxString emptyString;

        GRResetPenAndBrush( ( wxDC* ) &memDC );



        m_Parent->TraceWorkSheet( (wxDC*) &memDC, dummySize, pointLeftTop, pointRightBottom,

                                  emptyString, emptyString, m_tb, m_Screen->m_NumberOfScreens,

                                  paperType, emptyString, m_tb, m_Screen->m_NumberOfScreens,

                                  m_Screen->m_ScreenNumber, 1, appScale, LIGHTGRAY, RED );



        memDC.SelectObject( wxNullBitmap );

common/drawtxt.cpp

+40 −25
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ int NegableTextLength( const wxString& aText ) 
    {

        if( aText[i] == '~' )

        {

            /* '~~' draw as '~' and count as two chars */

            if( i > 0 && aText[i - 1] == '~' )

                i--;

            else

                char_count--;

        }

    }
@@ -160,8 +164,12 @@ int ReturnGraphicTextWidth( const wxString& aText, int aXSize, bool aItalic, boo 
    {

        int AsciiCode = aText[i];



        if( AsciiCode == '~' ) /* Skip the negation marks */

        /* Skip the negation marks

         * and first '~' char of '~~'

         * ('~~' draw as '~') */

        if( AsciiCode == '~' )

        {

            if( i > 0 && aText[i - 1] != '~' )

                continue;

        }
@@ -406,11 +414,17 @@ void DrawGraphicText( EDA_DRAW_PANEL* aPanel, 
        overbar_italic_comp = 0;

    };



    int overbars = 0;       // Number of ~ seen

    int overbars = 0;       /* Number of '~' seen (except '~~') */

    ptr = 0;   /* ptr = text index */

    while( ptr < char_count )

    {

        if( aText[ptr + overbars] == '~' )

        {

            if( ptr + overbars + 1 < aText.length() &&

                aText[ptr + overbars + 1] == '~' )  /* '~~' draw as '~' */

                ptr++;  // skip first '~' char and draw second



            else

            {

                /* Found an overbar, adjust the pointers */

                overbars++;
@@ -438,6 +452,7 @@ void DrawGraphicText( EDA_DRAW_PANEL* aPanel, 
                }

                continue; /* Skip ~ processing */

            }

        }



        AsciiCode = aText.GetChar( ptr + overbars );

common/newstroke_font.cpp

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ const char* const newstroke_font[] = 
    "KYVcUcSbR`RVQTOSQRRPRFSDUCVC",

    "H\\RbRD",

    "KYNcOcQbR`RVSTUSSRRPRFQDOCNC",

    "KZMHNGPFTHVGWF",

    "KZMSNRPQTSVRWQ",

    "F^K[KFYFY[K[",

    /* // LATIN-1 SUPPLEMENT (0080-00FF) */

    "F^K[KFYFY[K[", /* U+80 */

common/worksheet.cpp

+1147 −877

File changed.

Preview size limit exceeded, changes collapsed.