Commit 3e838053 authored by faa's avatar faa
Browse files

new font does not demand -DKICAD_CYRILLIC

parent a61b48ec

CMakeLists.txt

+1 −6
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) 
# building minizip.

# building minizip.

option(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)

option(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON)





# Russian GOST and CYRILLIC patch

# Russian GOST patch

option(KICAD_CYRILLIC "enable/disable building using cyrillic (needs unicode) (default OFF)")

option(wxUSE_UNICODE "enable/disable building unicode (default OFF)")

option(wxUSE_UNICODE "enable/disable building unicode (default OFF)")

option(KICAD_GOST "enable/disable building using GOST notation for multiple gates per package (default OFF)")

option(KICAD_GOST "enable/disable building using GOST notation for multiple gates per package (default OFF)")
@@ -43,10 +42,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) 
    set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")

    set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")

endif(CMAKE_COMPILER_IS_GNUCXX)

endif(CMAKE_COMPILER_IS_GNUCXX)





if(KICAD_CYRILLIC)

    add_definitions(-DKICAD_CYRILLIC)

endif(KICAD_CYRILLIC)



if(wxUSE_UNICODE)

if(wxUSE_UNICODE)

    add_definitions(-DwxUSE_UNICODE)

    add_definitions(-DwxUSE_UNICODE)

endif(wxUSE_UNICODE)

endif(wxUSE_UNICODE)

INSTALL.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -166,9 +166,6 @@ Build the "minizip" executable. Use OFF to disable it building. 
-DKICAD_PYTHON=ON

-DKICAD_PYTHON=ON

Build the KiCad with Python support.

Build the KiCad with Python support.





-DKICAD_CYRILLIC=ON

Build the KiCad with cyrillic fonts support.



-DwxUSE_UNICODE=ON

-DwxUSE_UNICODE=ON

Require on locale utf8 for build the KiCad with cyrillic fonts support.

Require on locale utf8 for build the KiCad with cyrillic fonts support.

common/drawtxt.cpp

+0 −16
Original line number Original line Diff line number Diff line
@@ -106,22 +106,6 @@ int NegableTextLength( const wxString& aText ) 
 */

 */

static const char* GetHersheyShapeDescription( int AsciiCode )

static const char* GetHersheyShapeDescription( int AsciiCode )

{

{

#if defined(KICAD_CYRILLIC)

    AsciiCode &= 0x7FF;

    if( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr

    {

        return hershey_cyrillic[AsciiCode - 0x410];

    }

    else if( AsciiCode == 0x401 )

    {

        return hershey_cyrillic[0x5];

    }

    else if( AsciiCode == 0x451 )

    {

        return hershey_cyrillic[0x25];

    }

#endif



    /* calculate font length */

    /* calculate font length */

    int font_length_max = sizeof(newstroke_font)/sizeof(*newstroke_font);

    int font_length_max = sizeof(newstroke_font)/sizeof(*newstroke_font);

    if ( AsciiCode >= (32 + font_length_max) )

    if ( AsciiCode >= (32 + font_length_max) )

include/hershey_fonts.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -37,6 +37,3 @@ 




#include "HersheySimplexRoman_sans_normal.h"

#include "HersheySimplexRoman_sans_normal.h"

#if defined(KICAD_CYRILLIC)

#include "HersheyCyrillic.h"

#endif