diff --git a/cpp/.gitignore b/cpp/.gitignore new file mode 100644 index 0000000..4fe37d4 --- /dev/null +++ b/cpp/.gitignore @@ -0,0 +1,4 @@ +**/CMakeFiles +**/Makefile +**/cmake_install.cmake +**/main \ No newline at end of file diff --git a/cpp/database/model/font.h b/cpp/database/model/font.h new file mode 100644 index 0000000..e69de29 diff --git a/cpp/fonts/CMakeCache.txt b/cpp/fonts/CMakeCache.txt new file mode 100644 index 0000000..f92b524 --- /dev/null +++ b/cpp/fonts/CMakeCache.txt @@ -0,0 +1,376 @@ +# This is the CMakeCache file. +# For build in directory: /home/kun1h/git/blog/cpp/fonts +# It was generated by CMake: /usr/bin/cmake +# You can edit this file to change values found and used by cmake. +# If you do not want to change any of the values, simply exit the editor. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a variable in the cache. +# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//Path to a program. +CMAKE_ADDR2LINE:FILEPATH=/usr/bin/addr2line + +//Path to a program. +CMAKE_AR:FILEPATH=/usr/bin/ar + +//Choose the type of build, options are: None Debug Release RelWithDebInfo +// MinSizeRel ... +CMAKE_BUILD_TYPE:STRING= + +//Enable/Disable color output during build. +CMAKE_COLOR_MAKEFILE:BOOL=ON + +//CXX compiler +CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++ + +//A wrapper around 'ar' adding the appropriate '--plugin' option +// for the GCC compiler +CMAKE_CXX_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar + +//A wrapper around 'ranlib' adding the appropriate '--plugin' option +// for the GCC compiler +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib + +//Flags used by the CXX compiler during all build types. +CMAKE_CXX_FLAGS:STRING= + +//Flags used by the CXX compiler during DEBUG builds. +CMAKE_CXX_FLAGS_DEBUG:STRING=-g + +//Flags used by the CXX compiler during MINSIZEREL builds. +CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG + +//Flags used by the CXX compiler during RELEASE builds. +CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG + +//Flags used by the CXX compiler during RELWITHDEBINFO builds. +CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG + +//C compiler +CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc + +//A wrapper around 'ar' adding the appropriate '--plugin' option +// for the GCC compiler +CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar + +//A wrapper around 'ranlib' adding the appropriate '--plugin' option +// for the GCC compiler +CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib + +//Flags used by the C compiler during all build types. +CMAKE_C_FLAGS:STRING= + +//Flags used by the C compiler during DEBUG builds. +CMAKE_C_FLAGS_DEBUG:STRING=-g + +//Flags used by the C compiler during MINSIZEREL builds. +CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG + +//Flags used by the C compiler during RELEASE builds. +CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG + +//Flags used by the C compiler during RELWITHDEBINFO builds. +CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG + +//Path to a program. +CMAKE_DLLTOOL:FILEPATH=CMAKE_DLLTOOL-NOTFOUND + +//Flags used by the linker during all build types. +CMAKE_EXE_LINKER_FLAGS:STRING= + +//Flags used by the linker during DEBUG builds. +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during MINSIZEREL builds. +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during RELEASE builds. +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= + +//Flags used by the linker during RELWITHDEBINFO builds. +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= + +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL= + +//Value Computed by CMake. +CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/kun1h/git/blog/cpp/fonts/CMakeFiles/pkgRedirects + +//Install path prefix, prepended onto install directories. +CMAKE_INSTALL_PREFIX:PATH=/usr/local + +//Path to a program. +CMAKE_LINKER:FILEPATH=/usr/bin/ld + +//Path to a program. +CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake + +//Flags used by the linker during the creation of modules during +// all build types. +CMAKE_MODULE_LINKER_FLAGS:STRING= + +//Flags used by the linker during the creation of modules during +// DEBUG builds. +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during the creation of modules during +// MINSIZEREL builds. +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during the creation of modules during +// RELEASE builds. +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= + +//Flags used by the linker during the creation of modules during +// RELWITHDEBINFO builds. +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= + +//Path to a program. +CMAKE_NM:FILEPATH=/usr/bin/nm + +//Path to a program. +CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy + +//Path to a program. +CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump + +//Value Computed by CMake +CMAKE_PROJECT_DESCRIPTION:STATIC= + +//Value Computed by CMake +CMAKE_PROJECT_HOMEPAGE_URL:STATIC= + +//Value Computed by CMake +CMAKE_PROJECT_NAME:STATIC=fonts + +//Path to a program. +CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib + +//Path to a program. +CMAKE_READELF:FILEPATH=/usr/bin/readelf + +//Flags used by the linker during the creation of shared libraries +// during all build types. +CMAKE_SHARED_LINKER_FLAGS:STRING= + +//Flags used by the linker during the creation of shared libraries +// during DEBUG builds. +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during the creation of shared libraries +// during MINSIZEREL builds. +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during the creation of shared libraries +// during RELEASE builds. +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= + +//Flags used by the linker during the creation of shared libraries +// during RELWITHDEBINFO builds. +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= + +//If set, runtime paths are not added when installing shared libraries, +// but are added when building. +CMAKE_SKIP_INSTALL_RPATH:BOOL=NO + +//If set, runtime paths are not added when using shared libraries. +CMAKE_SKIP_RPATH:BOOL=NO + +//Flags used by the linker during the creation of static libraries +// during all build types. +CMAKE_STATIC_LINKER_FLAGS:STRING= + +//Flags used by the linker during the creation of static libraries +// during DEBUG builds. +CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during the creation of static libraries +// during MINSIZEREL builds. +CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during the creation of static libraries +// during RELEASE builds. +CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= + +//Flags used by the linker during the creation of static libraries +// during RELWITHDEBINFO builds. +CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= + +//Path to a program. +CMAKE_STRIP:FILEPATH=/usr/bin/strip + +//If this value is on, makefiles will be generated without the +// .SILENT directive, and all commands will be echoed to the console +// during the make. This is useful for debugging only. With Visual +// Studio IDE projects all commands are done without /nologo. +CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE + +//Value Computed by CMake +fonts_BINARY_DIR:STATIC=/home/kun1h/git/blog/cpp/fonts/reader + +//Value Computed by CMake +fonts_IS_TOP_LEVEL:STATIC=OFF + +//Value Computed by CMake +fonts_SOURCE_DIR:STATIC=/home/kun1h/git/blog/cpp/fonts/reader + + +######################## +# INTERNAL cache entries +######################## + +//ADVANCED property for variable: CMAKE_ADDR2LINE +CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_AR +CMAKE_AR-ADVANCED:INTERNAL=1 +//This is the directory where this CMakeCache.txt was created +CMAKE_CACHEFILE_DIR:INTERNAL=/home/kun1h/git/blog/cpp/fonts +//Major version of cmake used to create the current loaded cache +CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 +//Minor version of cmake used to create the current loaded cache +CMAKE_CACHE_MINOR_VERSION:INTERNAL=26 +//Patch version of cmake used to create the current loaded cache +CMAKE_CACHE_PATCH_VERSION:INTERNAL=5 +//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE +CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 +//Path to CMake executable. +CMAKE_COMMAND:INTERNAL=/usr/bin/cmake +//Path to cpack program executable. +CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack +//Path to ctest program executable. +CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER +CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS +CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG +CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL +CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE +CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO +CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER +CMAKE_C_COMPILER-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS +CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG +CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL +CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE +CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO +CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_DLLTOOL +CMAKE_DLLTOOL-ADVANCED:INTERNAL=1 +//Path to cache edit program executable. +CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake +//Executable file format +CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS +CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG +CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE +CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 +//Name of external makefile project generator. +CMAKE_EXTRA_GENERATOR:INTERNAL= +//Name of generator. +CMAKE_GENERATOR:INTERNAL=Unix Makefiles +//Generator instance identifier. +CMAKE_GENERATOR_INSTANCE:INTERNAL= +//Name of generator platform. +CMAKE_GENERATOR_PLATFORM:INTERNAL= +//Name of generator toolset. +CMAKE_GENERATOR_TOOLSET:INTERNAL= +//Source directory with the top level CMakeLists.txt file for this +// project +CMAKE_HOME_DIRECTORY:INTERNAL=/home/kun1h/git/blog/cpp/fonts +//Install .so files without execute permission. +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 +//ADVANCED property for variable: CMAKE_LINKER +CMAKE_LINKER-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MAKE_PROGRAM +CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS +CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG +CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE +CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_NM +CMAKE_NM-ADVANCED:INTERNAL=1 +//number of local generators +CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=3 +//ADVANCED property for variable: CMAKE_OBJCOPY +CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_OBJDUMP +CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_RANLIB +CMAKE_RANLIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_READELF +CMAKE_READELF-ADVANCED:INTERNAL=1 +//Path to CMake installation. +CMAKE_ROOT:INTERNAL=/usr/share/cmake +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS +CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG +CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE +CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH +CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SKIP_RPATH +CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS +CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG +CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL +CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE +CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_STRIP +CMAKE_STRIP-ADVANCED:INTERNAL=1 +//uname command +CMAKE_UNAME:INTERNAL=/usr/bin/uname +//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE +CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 +//linker supports push/pop state +_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED:INTERNAL=TRUE + diff --git a/cpp/fonts/CMakeLists.txt b/cpp/fonts/CMakeLists.txt new file mode 100644 index 0000000..3f9dc77 --- /dev/null +++ b/cpp/fonts/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.10) +project(fonts) +add_subdirectory(core) +add_subdirectory(reader) +add_executable(main main.cpp) +target_link_libraries(main core reader) diff --git a/cpp/fonts/core/CMakeLists.txt b/cpp/fonts/core/CMakeLists.txt new file mode 100644 index 0000000..2b149d5 --- /dev/null +++ b/cpp/fonts/core/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories(../) +include_directories(./) +include_directories(./tables) +include_directories(./tables/name) +set(SOURCE +tables/name/name_id.h +tables/name/name.h +tables/name/name.cpp +tables/name/platform_id.h +tables/name/name_head.h +tables/name/name_head.cpp +tables/table.h +tables/table.cpp +tables/table_name.h +font.cpp +font.h +head.cpp +head.h +tables/cmap/cmap.h +tables/cmap/cmap.cpp +tables/cmap/encoding_record.h +tables/cmap/encoding_record.cpp +tables/cmap/header.cpp +tables/cmap/header.h +tables/cmap/platform.h +tables/cmap/tables.h +) +project(fonts) +add_library(core SHARED ${SOURCE}) \ No newline at end of file diff --git a/cpp/fonts/core/font.cpp b/cpp/fonts/core/font.cpp new file mode 100644 index 0000000..459a9e0 --- /dev/null +++ b/cpp/fonts/core/font.cpp @@ -0,0 +1,24 @@ +#include "font.h" +#include "tables/table_name.h" +#include "reader/buffer.h" +#include +#include "../reader/file.h" +font::font(const char* fontFile){ + file rd(fontFile); + path = rd.getPath(); + read(&rd); +} + +void font::read(reader* rd){ + //读取字体头 + head.read(rd); + //读取表信息 + table.read(rd, head.getTableCount()); + +} + +void font::display(){ + std::cout<<"font file"< + +class font +{ +private: + FontTable table; + fontHead head; + std::string path; +public: + font(){}; + font(const char*); + ~font(){}; + void read(reader*); + void display(); +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/head.cpp b/cpp/fonts/core/head.cpp new file mode 100644 index 0000000..0bd211a --- /dev/null +++ b/cpp/fonts/core/head.cpp @@ -0,0 +1,25 @@ +#include "head.h" +#include +void fontHead::read(reader* rd){ + //先读4字节，看是ttf还是ttc + auto ft = rd->readString(4); + if(ft == "ttcf"){ + throw "not support ttc"; + } + rd->seek(0); + verMain = rd->readUint16(); + verSub = rd->readUint16(); + tableCount = rd->readUint16(); + auto arg1 = rd->readUint16(); + args.push_back(arg1); + auto arg2 = rd->readUint16(); + args.push_back(arg2); + auto arg3 = rd->readUint16(); + args.push_back(arg3); +} + +void fontHead::display(){ + std::cout<<"this is header"< + +class fontHead +{ +private: + uint16_t verMain; + uint16_t verSub; + uint16_t tableCount; + std::list args; +public: + fontHead(/* args */){ + verMain = 0; + verSub = 0; + tableCount = 0; + args = {}; +}; + ~fontHead(){}; + void read(reader*); + void display(); + uint16_t getTableCount(){return tableCount;}; + std::list getArgs(){return args;}; +}; +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/base/base.h b/cpp/fonts/core/tables/base/base.h new file mode 100644 index 0000000..aa67edb --- /dev/null +++ b/cpp/fonts/core/tables/base/base.h @@ -0,0 +1,285 @@ +#ifndef __TABLE_BASE_HEADER_H__ +#define __TABLE_BASE_HEADER_H__ +#include "../../../reader/reader.h" +class BaseHeader1 +{ +private: + uint16_t _majorVersion; + uint16_t _minorVersion; + Offset16 _horizAxisOffset; + Offset16 _vertAxisOffset; +public: + BaseHeader1():_majorVersion(1),_minorVersion(0),_horizAxisOffset(0),_vertAxisOffset(0){}; + ~BaseHeader1(){}; + BaseHeader1(reader* rd){read(rd);}; + void read(reader *rd){ + if(_majorVersion!=1||_minorVersion!=0)return; + _majorVersion = rd->readUint16(); + _minorVersion = rd->readUint16(); + _horizAxisOffset = rd->readUint16(); + _vertAxisOffset = rd->readUint16(); + }; + uint16_t majorVersion()const{return _majorVersion;}; + uint16_t minorVersion()const{return _minorVersion;}; + uint16_t horizAxisOffset()const{return _horizAxisOffset;}; + uint16_t vertAxisOffset()const{return _vertAxisOffset;}; +}; + +// +class BaseHeader1_1: public BaseHeader1 +{ +private: + uint32_t _itemVarStoreOffset; +public: + BaseHeader1_1():_itemVarStoreOffset(0){}; + ~BaseHeader1_1(){}; + BaseHeader1_1(reader* rd):BaseHeader1(rd){read(rd);}; + void read(reader* rd){ + _itemVarStoreOffset = rd->readUint32(); + } + uint32_t itemVarStoreOffset()const{return _itemVarStoreOffset;}; +}; + +// +class AxisTable +{ +private: + uint16_t _baseTagListOffset; + uint16_t _baseScriptListOffset; +public: + AxisTable():_baseScriptListOffset(0),_baseTagListOffset(0){}; + ~AxisTable(){}; + AxisTable(reader* rd){read(rd);}; + void read(reader* rd){ + _baseTagListOffset = rd->readUint16(); + _baseScriptListOffset = rd->readUint16(); + } + uint16_t baseTagListOffset()const{return _baseTagListOffset;}; + uint16_t baseScriptListOffset()const{return _baseScriptListOffset;}; +}; + +class BaseTagList +{ +private: + uint16_t _baseTagCount; + std::vector _baselineTags; +public: + BaseTagList():_baseTagCount(0){}; + ~BaseTagList(){}; + BaseTagList(reader*rd){read(rd);}; + void read(reader *rd){ + _baseTagCount = rd->readUint16(); + for(auto i=0;i<_baseTagCount;i++){ + Tag t = rd->readTag(); + _baselineTags.push_back(t); + } + } + uint16 baseTagCount(){return _baseTagCount;}; + std::vector baselineTags(){return _baselineTags;}; +}; + +class BaseScriptRecord +{ +private: + Tag _baseScriptTag; + Offset16 _baseScriptOffset; +public: + BaseScriptRecord():_baseScriptOffset(0){}; + ~BaseScriptRecord(){}; + BaseScriptRecord(reader*rd){read(rd);}; + void read(reader* rd){ + _baseScriptTag = rd->readTag(); + _baseScriptOffset = rd->readOffset16(); + }; +}; + +class BaseScriptList +{ +private: + uint16 _baseScriptCount; + std::vector _baseScriptRecords; +public: + BaseScriptList():_baseScriptCount(0){}; + ~BaseScriptList(){}; + BaseScriptList(reader *rd){read(rd);}; + void read(reader *rd){ + _baseScriptCount = rd->readUint16(); + for(auto i = 0; i<_baseScriptCount; i++){ + BaseScriptRecord bs(rd); + _baseScriptRecords.push_back(rd); + } + } + uint16 baseScriptCount(){return _baseScriptCount;}; + std::vector baseScriptRecords(){return _baseScriptRecords;}; +}; + +class BaseValues +{ +private: + uint16 _defaultBaselineIndex; + uint16 _baseCoordCount; + std::vector _baseCoordOffset; +public: + BaseValues():_defaultBaselineIndex(0),_baseCoordCount(0){}; + ~BaseValues(){}; + BaseValues(reader*rd){read(rd);}; + void read(reader*rd){ + _defaultBaselineIndex = rd->readUint16(); + _baseCoordCount = rd->readUint16(); + for(auto i=0;i<_baseCoordCount; i++){ + Offset16 f = rd->readOffset16(); + _baseCoordOffset.push_back(f); + } + } + uint16 defaultBaselineIndex(){return _defaultBaselineIndex;}; + uint16 baseCoordCount(){return _baseCoordCount;}; + std::vector baseCoordOffset(){return _baseCoordOffset;}; +}; + +class BaseLangSys +{ +private: + Tag _baseLangSysTag; + Offset16 _minMaxOffset; +public: + BaseLangSys():_minMaxOffset(0){}; + ~BaseLangSys(){}; + BaseLangSys(reader* rd){read(rd);}; + void read(reader*rd){ + _baseLangSysTag = rd->readTag(); + _minMaxOffset = rd->readOffset16(); + } + Tag baseLangSysTag(){return _baseLangSysTag;}; + Offset16 minMaxOffset(){return _minMaxOffset;}; +}; + + +class BaseScript +{ +private: + Offset16 _baseValuesOffset; + Offset16 _defaultMinMaxOffset; + uint16 _baseLangSysCount; + std::vector _baseLangSysRecords; +public: + BaseScript():_baseLangSysCount(0),_defaultMinMaxOffset(0),_baseValuesOffset(0){}; + ~BaseScript(){}; + BaseScript(reader* rd){read(rd);}; + void read(reader* rd){ + _baseValuesOffset = rd->readOffset16(); + _defaultMinMaxOffset = rd->readOffset16(); + _baseLangSysCount = rd->readUint16(); + for(auto i = 0; i<_baseLangSysCount;i++){ + BaseLangSys bls(rd); + _baseLangSysRecords.push_back(bls); + } + } + Offset16 baseValueOffset(){return _baseValuesOffset;}; + Offset16 defaultMinMaxOffset(){return _defaultMinMaxOffset;}; + uint16 baseLangSysCount(){return _baseLangSysCount;}; + std::vector baseLangSysRecords(){return _baseLangSysRecords;}; +}; + +class MinMax +{ +private: + Offset16 _minCoordOffset; + Offset16 _maxCoordOffset; + uint16 _featMinMaxCount; + std::vector _featMinMaxRecords; +public: + MinMax():_minCoordOffset(0),_maxCoordOffset(0),_featMinMaxCount(0){}; + ~MinMax(){}; + MinMax(reader *rd){read(rd);}; + void read(reader *rd){ + _minCoordOffset = rd->readOffset16(); + _maxCoordOffset = rd->readOffset16(); + _featMinMaxCount = rd->readUint16(); + for(auto i=0; i<_featMinMaxCount;i++){ + FeatMinMax fmm(rd); + _featMinMaxRecords.push_back(fmm); + } + } + Offset16 minCoordOffset(){return _minCoordOffset;}; + Offset16 maxCoordOffset(){return _maxCoordOffset;}; + uint16 featMinMaxCount(){return _featMinMaxCount;}; + std::vector featMinMaxRecords(){return _featMinMaxRecords;}; +}; + +class FeatMinMax +{ +private: + Tag _featureTag; + Offset16 _minCoordOffset; + Offset16 _maxCoordOffset; +public: + FeatMinMax():_minCoordOffset(0), _maxCoordOffset(0){}; + ~FeatMinMax(){}; + FeatMinMax(reader*rd){read(rd);}; + void read(reader*rd){ + _featureTag = rd->readTag(); + _minCoordOffset =rd->readOffset16(); + _maxCoordOffset = rd->readOffset16(); + } + Tag featureTag(){return _featureTag;}; + Offset16 minCoordOffset(){return _minCoordOffset;} + Offset16 maxCoordOffset(){return _maxCoordOffset;} +}; + +class BaseCoord1 +{ +private: + uint16 _format; + int16 _coordinate; +public: + BaseCoord1():_format(0),_coordinate(0){}; + ~BaseCoord1(){}; + BaseCoord1(reader*rd){read(rd);}; + void read(reader*rd){ + _format = rd->readUint16(); + _coordinate = rd->readInt16(); + } + uint16 format(){return _format;} + int16 cordinate(){return _coordinate;} +}; + +class BaseCoord2: public BaseCoord1 +{ +private: + uint16 _referenceGlyph; + uint16 _baseCoordPoint; +public: + BaseCoord2():_referenceGlyph(0),_baseCoordPoint(0){}; + ~BaseCoord2(){}; + BaseCoord2(reader*rd):BaseCoord1(rd){read(rd);}; + void read(reader* rd){ + _referenceGlyph = rd->readUint16(); + _baseCoordPoint = rd->readUint16(); + } + uint16 referenceGlyph(){return _referenceGlyph;} + uint16 baseCoordPoint(){return _baseCoordPoint;} +}; + +class BaseCoord3 : public BaseCoord1 +{ +private: + Offset16 _deviceOffset; +public: + BaseCoord3():_deviceOffset(0){}; + ~BaseCoord3(){}; + BaseCoord3(reader *rd):BaseCoord1(rd){read(rd);}; + void read(reader *rd){ + _deviceOffset = rd->readOffset16(); + } + Offset16 deviceOffset(){return _deviceOffset;} +}; + + + + + + + + + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/cmap.cpp b/cpp/fonts/core/tables/cmap/cmap.cpp new file mode 100644 index 0000000..c54b9f1 --- /dev/null +++ b/cpp/fonts/core/tables/cmap/cmap.cpp @@ -0,0 +1,70 @@ +#include "cmap.h" + +void cmap::read(reader *rd) +{ + _header = CmapHeader(rd); + auto curr = rd->curr(); + _tableFormat = rd->readUint16(); + rd->seek(curr); + switch (_tableFormat) + { + case 0: + { + CmapTable0 t(rd); + _table = &t; + } + break; + case 2: + { + CmapTable2 t(rd); + _table = &t; + } + break; + + case 4: + { + CmapTable4 t(rd); + _table = &t; + } + break; + case 6: + { + CmapTable6 t(rd); + _table = &t; + } + break; + case 8: + { + CmapTable8 t(rd); + _table = &t; + } + break; + case 10: + { + CmapTable10 t(rd); + _table = &t; + } + break; + case 12: + { + CmapTable12 t(rd); + _table = &t; + } + break; + case 13: + { + CmapTable13 t(rd); + _table = &t; + } + break; + case 14: + { + CmapTable14 t(rd); + _table = &t; + } + break; + default: + _table = nullptr; + break; + } +} \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/cmap.h b/cpp/fonts/core/tables/cmap/cmap.h new file mode 100644 index 0000000..99ae8e3 --- /dev/null +++ b/cpp/fonts/core/tables/cmap/cmap.h @@ -0,0 +1,25 @@ +#ifndef __TABLE_CMAP_H__ +#define __TABLE_CMAP_H__ +#include "../../../reader/reader.h" +#include "tables.h" +#include "header.h" +class CmapTable +{ +private: + CmapHeader _header; + uint16_t _tableFormat; + CmapTableBase *_table; + +public: + CmapTable():_tableFormat(0),_table(nullptr){}; + ~CmapTable(){}; + CmapTable(reader* rd){read(rd);}; + void read(reader*); + uint16_t tableFormat()const{return _tableFormat;} + CmapTableBase* table()const{return _table;} + CmapHeader header()const{return _header;} +}; + + + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/encoding_record.cpp b/cpp/fonts/core/tables/cmap/encoding_record.cpp new file mode 100644 index 0000000..6407afe --- /dev/null +++ b/cpp/fonts/core/tables/cmap/encoding_record.cpp @@ -0,0 +1,11 @@ +#include "encoding_record.h" + +void CmapEncodingRecord::read(reader* rd){ + _platformId = rd->readUint16(); + _encodingId = rd->readUint16(); + _tableOffset = rd->readUint32(); +} + +CmapEncodingRecord::CmapEncodingRecord(reader* rd){ + read(rd); +} \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/encoding_record.h b/cpp/fonts/core/tables/cmap/encoding_record.h new file mode 100644 index 0000000..056d21b --- /dev/null +++ b/cpp/fonts/core/tables/cmap/encoding_record.h @@ -0,0 +1,22 @@ +#ifndef __ENCODING_RECORD_H__ +#define __ENCODING_RECORD_H__ +#include +#include "../../../reader/reader.h" +class CmapEncodingRecord +{ +private: + uint16_t _platformId; + uint16_t _encodingId; + uint32_t _tableOffset; +public: + CmapEncodingRecord():_platformId(0),_encodingId(0),_tableOffset(0){}; + ~CmapEncodingRecord(){}; + CmapEncodingRecord(reader*); + void read(reader*); + uint16_t platformId(){return _platformId;}; + uint16_t encodingId(){return _encodingId;}; + uint32_t tableOffset(){return _tableOffset;}; +}; + + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/header.cpp b/cpp/fonts/core/tables/cmap/header.cpp new file mode 100644 index 0000000..642f5ca --- /dev/null +++ b/cpp/fonts/core/tables/cmap/header.cpp @@ -0,0 +1,14 @@ +#include "header.h" + +void CmapHeader::read(reader* rd){ + _version = rd->readUint16(); + _numTables = rd->readUint16(); + for(auto i = 0; i<_numTables; i++){ + CmapEncodingRecord cer(rd); + _recordTables.push_back(cer); + } +} + +CmapHeader::CmapHeader(reader* rd){ + read(rd); +} \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/header.h b/cpp/fonts/core/tables/cmap/header.h new file mode 100644 index 0000000..b1231a4 --- /dev/null +++ b/cpp/fonts/core/tables/cmap/header.h @@ -0,0 +1,24 @@ +#ifndef __CMAP_HEADER_H__ +#define __CMAP_HEADER_H__ +#include +#include "encoding_record.h" +#include +class CmapHeader +{ +private: + uint16_t _version; + uint16_t _numTables; + std::list _recordTables; +public: + CmapHeader():_version(0),_numTables(0), _recordTables(){}; + CmapHeader(reader*); + ~CmapHeader(){}; + void read(reader*); + uint16_t version(){return _version;}; + uint16_t numberTables(){return _numTables;}; + std::list recordTables(){return _recordTables;}; +}; + + + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/platform.h b/cpp/fonts/core/tables/cmap/platform.h new file mode 100644 index 0000000..615c653 --- /dev/null +++ b/cpp/fonts/core/tables/cmap/platform.h @@ -0,0 +1,54 @@ +#ifndef __CMAP_PLATFORM_H__ +#define __CMAP_PLATFORM_H__ +enum platformIds +{ + Unicode, + Macintosh, + ISO, // deprecated + Windows, + Custom +}; +enum EncodingPlatformUnicode +{ + Unicode1_0, // deprecated + Unicode1_1, // deprecated + ISO_10646, // deprecated + Unicode2_0_BMP, + Unicode2_0_Full, + Unicode_Variation_Sequences, // for table 14 + Unicode_Full, // for table 13 +}; + +enum EncodingMacintosh +{ + +}; + +enum EncodingISO +{ + ASCII_7Bit, + ISO_10646, + ISO_8859_1, +}; + +enum EncodingWindows +{ + Symbol, + Unicode_BMP, + ShiftJIS, + PRC, + Big5, + Wansung, + Johab, + Reserved, + Reserved, + Reserved, + Unicode_Full, +}; + +enum EncodingCustom +{ + +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/cmap/tables.h b/cpp/fonts/core/tables/cmap/tables.h new file mode 100644 index 0000000..41891c7 --- /dev/null +++ b/cpp/fonts/core/tables/cmap/tables.h @@ -0,0 +1,502 @@ +#ifndef __CMAP_TABLES_H__ +#define __CMAP_TABLES_H__ +#include +#include "../../../reader/reader.h" +#include +#include +#include "../../../types/types.h" + +#define list_uint16 std::vector +#define list_uint8 std::vector +#define list_int16 std::vector +class CmapTableBase +{ +private: + uint16_t _format; + uint16_t _length; + uint16_t _language; + uint16_t _reserved; + +public: + CmapTableBase() : _format(0), _length(0), _language(0), _reserved(0) {}; + ~CmapTableBase() {}; + CmapTableBase(reader *rd) { read(rd); }; + void read(reader *rd) + { + _format = rd->readUint16(); + _reserved = 0; + if (_format == 8 || _format == 10 || _format == 12 || _format == 13) + _reserved = rd->readUint16(); + _length = rd->readUint16(); + if (_format == 14) + { + return; + } + _language = rd->readUint16(); + }; + uint16_t format() const { return _format; }; + uint16_t length() const { return _length; }; + uint16_t language() const { return _language; }; + virtual uint16 Format() = 0; +}; + +class CmapTable0 : public CmapTableBase +{ +private: + list_uint8 _glyphldArray; + uint16_t _glyphldCount; + +public: + CmapTable0() : CmapTableBase(), _glyphldCount(256) {}; + ~CmapTable0() {}; + CmapTable0(reader *rd) : CmapTableBase(rd), _glyphldCount(256) { read(rd); }; + void read(reader *rd) + { + if (format() != 0) + return; + for (auto i = 0; i < _glyphldCount; i++) + { + uint8_t glyph = rd->readUint8(); + _glyphldArray.push_back(glyph); + } + }; + list_uint8 glyphldArray() const { return _glyphldArray; }; + uint16 Format()override{return format();} +}; + +class CmapTable2SubHeader +{ +private: + uint16_t _firstCode; + uint16_t _entryCount; + uint16_t _idDelta; + uint16_t _idRangeOffset; + +public: + CmapTable2SubHeader() : _firstCode(0), _entryCount(0), _idDelta(0), _idRangeOffset(0) {}; + ~CmapTable2SubHeader() {}; + CmapTable2SubHeader(reader *rd) { read(rd); }; + void read(reader *rd) + { + _firstCode = rd->readUint16(); + _entryCount = rd->readUint16(); + _idDelta = rd->readUint16(); + _idRangeOffset = rd->readUint16(); + }; + uint16_t firstCode() const { return _firstCode; }; + uint16_t entryCount() const { return _entryCount; }; + uint16_t idDelta() const { return _idDelta; }; + uint16_t idRangeOffset() const { return _idRangeOffset; }; +}; +// 不常用 +class CmapTable2 : public CmapTableBase +{ +private: + list_uint16 _subHeaderKey; + std::vector _subHeader; + list_uint16 _glyphldArray; + uint16_t _searchHeaderKeyCount; + +public: + CmapTable2() : _searchHeaderKeyCount(256) {}; + ~CmapTable2() {}; + CmapTable2(reader *rd) : CmapTableBase(rd), _searchHeaderKeyCount(256) { read(rd); }; + void read(reader *rd) + { + if (format() != 2) + return; + }; // 计算很复杂 + list_uint16 subHeaderKey() const { return _subHeaderKey; }; + std::vector subHeader() { return _subHeader; }; + list_uint16 glyphldArray() const { return _glyphldArray; }; + uint16 Format()override{return format();} +}; + +class CmapTable4 : public CmapTableBase +{ +private: + uint16_t _segCountX2; + uint16_t _segCount; + uint16_t _searchRange; + uint16_t _entrySelector; + uint16_t _rangeShift; + list_uint16 _endCode; + uint16_t _reservedPad; + list_uint16 _startCode; + list_int16 _idDelta; + list_uint16 _idRangeOffset; + list_uint16 _glyphldArray; + void _calculate() + { + _segCount = _segCountX2 / 2; + _entrySelector = _segCount < 0 ? 0 : static_cast(std::floor(std::log2(_segCount))); + _searchRange = static_cast(std::pow(2, _entrySelector + 1)); + _rangeShift = _segCountX2 - _searchRange; + return; + }; + +public: + CmapTable4() : _segCountX2(0), _searchRange(0), _entrySelector(0), _rangeShift(0), _reservedPad(0) {}; + ~CmapTable4() {}; + CmapTable4(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 4) + return; + _segCountX2 = rd->readUint16(); + _searchRange = rd->readUint16(); + _entrySelector = rd->readUint16(); + _rangeShift = rd->readUint16(); + _calculate(); // 计算代替读取 + for (auto i = 0; i < _segCount; i++) + { + uint16_t code = rd->readUint16(); + _endCode.push_back(code); + } + _reservedPad = rd->readUint16(); + for (auto i = 0; i < _segCount; i++) + { + uint16_t code = rd->readUint16(); + _startCode.push_back(code); + } + for (auto i = 0; i < _segCount; i++) + { + int16_t code = rd->readUint16(); + _idDelta.push_back(code); + } + for (auto i = 0; i < _segCount; i++) + { + uint16_t code = rd->readUint16(); + _idRangeOffset.push_back(code); + } + while (rd->curr() < rd->getLength()) + { + uint16_t glyph = rd->readUint16(); + _glyphldArray.push_back(glyph); + } + }; + uint16_t segCountX2() const { return _segCountX2; }; + uint16_t segCount() const { return _segCount; }; + uint16_t searchRange() const { return _searchRange; }; + uint16_t entrySelector() const { return _entrySelector; }; + uint16_t rangeShift() const { return _rangeShift; }; + list_uint16 startCode() const { return _startCode; }; + list_uint16 endCode() const { return _endCode; }; + uint16_t reservePad() const { return _reservedPad; }; + list_int16 idDelta() const { return _idDelta; }; + list_uint16 idRangeOffset() const { return _idRangeOffset; }; + list_uint16 glyphldArray() const { return _glyphldArray; }; + uint16_t glyphId(uint16_t c, int i) const { return *(_idRangeOffset[i] / 2 + (c - _startCode[i]) + &_idRangeOffset[i]); }; + uint16 Format()override{return format();} +}; + +class CmapTable6 : public CmapTableBase +{ +private: + uint16_t _firstCode; + uint16_t _entryCount; + list_uint16 _glyphldArray; + +public: + CmapTable6() : _firstCode(0), _entryCount(0) {}; + ~CmapTable6() {}; + CmapTable6(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 6) + return; + _firstCode = rd->readUint16(); + _entryCount = rd->readUint16(); + for (auto i = 0; i < _entryCount; i++) + { + uint16_t glyph = rd->readUint16(); + _glyphldArray.push_back(glyph); + } + }; + uint16_t firstCode() const { return _firstCode; }; + uint16_t entryCount() const { return _entryCount; }; + list_uint16 glyphldArray() const { return _glyphldArray; }; + uint16 Format()override{return format();} +}; + +// +class MapGroup +{ +private: + uint32_t _startCharCode; + uint32_t _endCharCode; + uint32_t _startGlyphId; + +public: + MapGroup() : _startCharCode(0), _endCharCode(0), _startGlyphId(0) {}; + ~MapGroup() {}; + MapGroup(reader *rd) { read(rd); }; + void read(reader *rd) + { + _startCharCode = rd->readUint32(); + _endCharCode = rd->readUint32(); + _startGlyphId = rd->readUint32(); + }; + uint32_t startCharCode() const { return _startCharCode; }; + uint32_t endCharCode() const { return _endCharCode; }; + uint32_t startGlyphId() const { return _startGlyphId; }; +}; + +class CmapTable8 : public CmapTableBase +{ +private: + list_uint8 _is32; + uint16_t _is32Count; + uint32_t _numGroups; + std::vector _groups; + +public: + CmapTable8() : _is32Count(8192), _numGroups(0) {}; + ~CmapTable8() {}; + CmapTable8(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 8) + return; + for (auto i = 0; i < _is32Count; i++) + { + uint8_t u = rd->readUint8(); + _is32.push_back(u); + } + _numGroups = rd->readUint32(); + for (auto i = 0; i < _numGroups; i++) + { + MapGroup mg(rd); + _groups.push_back(mg); + } + }; + list_uint8 is32() const { return _is32; }; + uint16_t numGroups() const { return _numGroups; }; + std::vector groups() const { return _groups; }; + uint16 Format()override{return format();} +}; + +// + +class CmapTable10 : public CmapTableBase +{ +private: + uint32_t _startCharCode; + uint32_t _numChars; + list_uint16 _glyphldArray; + +public: + CmapTable10() : _startCharCode(0), _numChars(0) {}; + ~CmapTable10() {}; + CmapTable10(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 10) + return; + _startCharCode = rd->readUint32(); + _numChars = rd->readUint32(); + while (rd->curr() < rd->getLength()) + { + uint16_t glyph = rd->readUint16(); + _glyphldArray.push_back(glyph); + } + }; + uint32_t startCharCode() const { return _startCharCode; }; + uint32_t numChars() const { return _numChars; }; + list_uint16 glyphldArray() const { return _glyphldArray; }; + uint16 Format()override{return format();} +}; + +// + +class CmapTable12 : public CmapTableBase +{ +private: + uint32_t _numGroups; + std::vector _groups; + +public: + CmapTable12() : _numGroups(0) {}; + ~CmapTable12() {}; + CmapTable12(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 12) + return; + _numGroups = rd->readUint32(); + for (auto i = 0; i < _numGroups; i++) + { + MapGroup mg(rd); + _groups.push_back(mg); + } + }; + uint16_t numGroups() const { return _numGroups; }; + std::vector groups() const { return _groups; }; + uint16 Format()override{return format();} +}; + +// +class CmapTable13 : public CmapTableBase +{ +private: + uint32_t _numGroups; + std::vector _groups; + +public: + CmapTable13() : _numGroups(0) {}; + ~CmapTable13() {}; + CmapTable13(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 13) + return; + _numGroups = rd->readUint32(); + for (auto i = 0; i < _numGroups; i++) + { + MapGroup mg(rd); + _groups.push_back(mg); + } + }; + uint16_t numGroups() const { return _numGroups; }; + std::vector groups() const { return _groups; }; + uint16 Format()override{return format();} +}; + +// + +class VariationSelector +{ +private: + uint24 _varSelector; // read 24 bit + uint16_t _defualtUVSOffset; + uint16_t _nonDefaultUVSOffset; + +public: + VariationSelector() : _varSelector(0), _defualtUVSOffset(0), _nonDefaultUVSOffset(0) {}; + ~VariationSelector() {}; + VariationSelector(reader *rd) { read(rd); }; + void read(reader *rd) + { + _varSelector = rd->readUint24(); + _defualtUVSOffset = rd->readUint16(); + _nonDefaultUVSOffset = rd->readUint16(); + }; + uint32_t varSelector() const { return _varSelector; }; + uint16_t defaultUVSOffset() const { return _defualtUVSOffset; }; + uint16_t nonDefaultUVSOffset() const { return _nonDefaultUVSOffset; }; +}; + +// +class CmapTable14 : public CmapTableBase +{ +private: + uint32_t _numVarSelectorRecords; + std::vector _varSelector; + +public: + CmapTable14() : _numVarSelectorRecords(0) {}; + ~CmapTable14() {}; + CmapTable14(reader *rd) : CmapTableBase(rd) { read(rd); }; + void read(reader *rd) + { + if (format() != 14) + return; + _numVarSelectorRecords = rd->readUint32(); + for (auto i = 0; i < _numVarSelectorRecords; i++) + { + VariationSelector vs(rd); + _varSelector.push_back(vs); + } + }; + uint32_t numVarSelectorRecords() const { return _numVarSelectorRecords; }; + std::vector varSelector() const { return _varSelector; }; + uint16 Format()override{return format();} +}; + +// default uvs table +class UnicodeRange +{ +private: + uint24 _startUnicodeValue; + uint8_t _additionalCount; + +public: + UnicodeRange() : _startUnicodeValue(0), _additionalCount(0) {}; + ~UnicodeRange() {}; + UnicodeRange(reader *rd) { read(rd); }; + void read(reader *rd) + { + _startUnicodeValue = rd->readUint24(); + _additionalCount = rd->readUint8(); + }; + uint32_t startUnicodeValue() const { return _startUnicodeValue; }; + uint8_t additionalCount() const { return _additionalCount; }; +}; + +class DefaultUVS +{ +private: + uint32_t _numUnicodeValueRanges; + std::vector _ranges; + +public: + DefaultUVS() : _numUnicodeValueRanges(0) {}; + ~DefaultUVS() {}; + DefaultUVS(reader *rd) { read(rd); }; + void read(reader *rd) + { + _numUnicodeValueRanges = rd->readInt32(); + for (auto i = 0; i < _numUnicodeValueRanges; i++) + { + UnicodeRange ur(rd); + _ranges.push_back(ur); + } + }; + uint32_t numUnicodeValueRanges() const { return _numUnicodeValueRanges; }; + std::vector range() const { return _ranges; }; +}; + +// non-default uvs table +class UVSMapping +{ +private: + uint24 _unicodeValue; + uint16_t _glyphId; + +public: + UVSMapping() : _unicodeValue(0), _glyphId(0) {}; + ~UVSMapping() {}; + UVSMapping(reader *rd) { read(rd); }; + void read(reader *rd) + { + _unicodeValue = rd->readUint24(); + _glyphId = rd->readUint16(); + }; + uint32_t unicodeValue() const { return _unicodeValue; }; + uint16_t glyphId() const { return _glyphId; }; +}; + +class NonDefaultUVS +{ +private: + uint32_t _numUVSMappings; + std::vector _uvsMappings; + +public: + NonDefaultUVS() : _numUVSMappings(0) {}; + ~NonDefaultUVS() {}; + NonDefaultUVS(reader *rd) { read(rd); }; + void read(reader *rd) + { + _numUVSMappings = rd->readUint32(); + for (auto i = 0; i < _numUVSMappings; i++) + { + UVSMapping um(rd); + _uvsMappings.push_back(um); + } + }; + uint32_t numUVSMappings() const { return _numUVSMappings; }; + std::vector uvsMappings() const { return _uvsMappings; }; +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/glyf/glyf.h b/cpp/fonts/core/tables/glyf/glyf.h new file mode 100644 index 0000000..e39de27 --- /dev/null +++ b/cpp/fonts/core/tables/glyf/glyf.h @@ -0,0 +1,85 @@ +#ifndef __GLYF_H__ +#define __GLYF_H__ +#include "../../../reader/reader.h" +#define ON_CURVE_POINT 0x01 +#define X_SHORT_VECTOR 0x02 +#define Y_SHORT_VECTOR 0x04 +#define REPEAT_FLAG 0x08 +#define X_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR 0x10 +#define Y_IS_SAME_OR_POSITIVE_X_SHORT_VECTOR 0x20 +#define OVERLAP_SIMPLE 0x40 +#define FLAG_Reserved 0x80 +#define list_uint8 std::vector +#define list_uint16 std::vector +/* +header 其实是字形的边界框 + */ +class GlyfTableHeader +{ +private: + int16_t _numberOfContours; //非负数表示简单字形，负数表示复合字形 + int16_t _xMin; + int16_t _yMin; + int16_t _xMax; + int16_t _yMax; + +public: + GlyfTableHeader():_numberOfContours(0),_xMax(0),_yMax(0),_xMin(0),_yMin(0){}; + ~GlyfTableHeader(){}; + GlyfTableHeader(reader* rd){read(rd);}; + void read(reader*rd){ + _numberOfContours = rd->readInt16(); + _xMin = rd->readInt16(); + _yMin = rd->readInt16(); + _xMax = rd->readInt16(); + _yMax = rd->readInt16(); + } + int16_t numberOfContours(){return _numberOfContours;}; + int16_t xMin(){return _xMin;}; + int16_t yMin()const{return _yMin;}; + int16_t xMax()const{return _xMax;}; + int16_t yMax()const{return _yMax;}; +}; +// +class SimpleGlyfTable +{ +private: + uint16_t _numOfContours; + list_uint16 _endPtsOfContours; + uint16_t _instructionLength; + list_uint8 _instructions; + list_uint8 _flags; + list_uint16 _xCoordinates; + list_uint16 _yCoordinates; + +public: + SimpleGlyfTable() : _instructionLength(0), _numOfContours(0) {}; + ~SimpleGlyfTable() {}; + SimpleGlyfTable(uint16_t numOfContours, reader *rd) + { + _numOfContours = numOfContours; + read(rd); + }; + void read(reader *rd) + { + for (auto i = 0; i < _numOfContours; i++) + { + uint16_t n = rd->readUint16(); + _endPtsOfContours.push_back(n); + } + _instructionLength = rd->readUint16(); + for (auto i = 0; i < _instructionLength; i++) + { + uint8_t n = rd->readUint8(); + _instructions.push_back(n); + } + }; + list_uint16 endPtsOfContours() { return _endPtsOfContours; }; + uint16_t instructionLength() { return _instructionLength; }; + list_uint8 instructions() { return _instructions; }; + list_uint8 flags() { return _flags; }; + list_uint16 xCoordinates() { return _xCoordinates; }; + list_uint16 yCoordinates() { return _yCoordinates; }; +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/head/head.h b/cpp/fonts/core/tables/head/head.h new file mode 100644 index 0000000..ded90d5 --- /dev/null +++ b/cpp/fonts/core/tables/head/head.h @@ -0,0 +1,90 @@ +#ifndef __TABLE_HEAD_H__ +#define __TABLE_HEAD_H__ +#include "../../../reader/reader.h" + +class HeadTable +{ +private: + uint16 _majorVersion; + uint16 _minorVersion; + Fixed _fontRevision; + uint32 _checksumAdjustment; + uint32 _magicNumber; + uint16 _flags; + uint16 _unitsPerEm; + LONGDATETIME _created; + LONGDATETIME _modified; + int16 _xMin; + int16 _yMin; + int16 _xMax; + int16 _yMax; + uint16 _maxStyle; + uint16 _lowestRecPPEM; + int16 _fontDirectHint; + int16 _indexToLocFormat; + int16 _glyphDataFormat; + +public: + HeadTable() : _majorVersion(0), + _minorVersion(0), + _fontRevision(), + _checksumAdjustment(0), + _magicNumber(0), + _flags(0), + _unitsPerEm(0), + _created(0), + _modified(0), + _xMin(0), + _yMin(0), + _xMax(0), + _yMax(0), + _maxStyle(0), + _lowestRecPPEM(0), + _fontDirectHint(0), + _indexToLocFormat(0), + _glyphDataFormat(0) {}; + ~HeadTable() {}; + HeadTable(reader *rd) { read(rd); } + void read(reader *rd) + { + _majorVersion = rd->readUint16(); + _minorVersion = rd->readUint16(); + _fontRevision = rd->readFixed(); + _checksumAdjustment = rd->readUint32(); + _magicNumber = rd->readUint32(); + _flags = rd->readUint16(); + _unitsPerEm = rd->readUint16(); + _created = rd->readUint64(); + _modified = rd->readUint64(); + _xMin = rd->readInt16(); + _yMin = rd->readInt16(); + _xMax = rd->readInt16(); + _yMax = rd->readInt16(); + _maxStyle = rd->readUint16(); + _lowestRecPPEM = rd->readUint16(); + _fontDirectHint = rd->readInt16(); + _indexToLocFormat = rd->readInt16(); + _glyphDataFormat = rd->readInt16(); + } + + uint16 majorVersion() { return _majorVersion; } + uint16 minorVersion() { return _minorVersion; } + Fixed fontRevision() { return _fontRevision; } + uint32 checksumAdjustment() { return _checksumAdjustment; } + uint32 magicNumber() { return _magicNumber; } + uint16 flags() { return _flags; } + uint16 unitsPerEm() { return _unitsPerEm; } + LONGDATETIME created() { return _created; } + LONGDATETIME modified() { return _modified; } + int16 xMin() { return _xMin; } + int16 yMin() { return _yMin; } + int16 xMax() { return _xMax; } + int16 yMax() { return _yMax; } + uint16 maxStyle() { return _maxStyle; } + uint16 lowestRecPPEM() { return _lowestRecPPEM; } + int16 fontDirectHint() { return _fontDirectHint; } + int16 indexToLocFormat() { return _indexToLocFormat; } + int16 glyphDataFormat() { return _glyphDataFormat; } +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/loca/loca.h b/cpp/fonts/core/tables/loca/loca.h new file mode 100644 index 0000000..7c5583d --- /dev/null +++ b/cpp/fonts/core/tables/loca/loca.h @@ -0,0 +1,60 @@ +#ifndef __TABLE_LOCA_H__ +#define __TABLE_LOCA_H__ +#include "../../../reader/reader.h" +#define LocaShortFormat 0 +#define LocaLongFormat 1 +class LocaTable +{ +private: + uint16 _numGlyphs; +public: + LocaTable():_numGlyphs(0){}; + ~LocaTable(){}; + LocaTable(uint16 i):_numGlyphs(i){} + uint16 numGlyphs(){return _numGlyphs;} +}; + +class LocaTableShort: public LocaTable +{ +private: + uint16 _indexToLocFormat; + std::vector _offsets; +public: + LocaTableShort():_indexToLocFormat(LocaShortFormat){}; + ~LocaTableShort(){}; + LocaTableShort(uint16 num):LocaTable(num),_indexToLocFormat(LocaShortFormat){} + LocaTableShort(uint16 num, reader *rd):LocaTable(num),_indexToLocFormat(LocaShortFormat){read(rd);} + void read(reader *rd){ + for(auto i=0;ireadOffset16(); + _offsets.push_back(o); + } + } + uint16 format(){return _indexToLocFormat;} + std::vector offsets(){return _offsets;} +}; + + +class LocaTableLong: public LocaTable +{ +private: + uint16 _indexToLocFormat; + std::vector _offsets; +public: + LocaTableLong():_indexToLocFormat(LocaLongFormat){}; + ~LocaTableLong(){}; + LocaTableLong(uint16 num):LocaTable(num),_indexToLocFormat(LocaLongFormat){} + LocaTableLong(uint16 num, reader *rd):LocaTable(num),_indexToLocFormat(LocaLongFormat){read(rd);} + void read(reader *rd){ + for(auto i=0;ireadOffset32(); + _offsets.push_back(o); + } + } + uint16 format(){return _indexToLocFormat;} + std::vector offsets(){return _offsets;} +}; + + + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/maxp/maxp.h b/cpp/fonts/core/tables/maxp/maxp.h new file mode 100644 index 0000000..6a0848f --- /dev/null +++ b/cpp/fonts/core/tables/maxp/maxp.h @@ -0,0 +1,84 @@ +#ifndef __TABLE_MAXP_H__ +#define __TABLE_MAXP_H__ +#include "../../../reader/reader.h" + +class MaxpTable +{ +private: + Version16Dot16 _version; + uint16 _numGlyphs; + +public: + MaxpTable() : _version(0x00005000), _numGlyphs(0) {}; + ~MaxpTable() {}; + MaxpTable(uint32 n) : _version(n), _numGlyphs(0) {}; + MaxpTable(reader *rd) { read(rd); } + void read(reader *rd) + { + _version = rd->readVersion16Dot16(); + _numGlyphs = rd->readUint16(); + } + Version16Dot16 version() { return _version; } + uint16 numGlyphs() { return _numGlyphs; } +}; + + +#define MaxpTable0Dot5 MaxpTable + +class MaxpTable1Dot0 : public MaxpTable +{ +private: + uint16 _maxPoints; + uint16 _maxContours; + uint16 _maxCompositePoints; + uint16 _maxCompositeContours; + uint16 _maxZones; + uint16 _maxTwilightPoints; + uint16 _maxStorage; + uint16 _maxFunctionDefs; + uint16 _maxInstructionDefs; + uint16 _maxStackElements; + uint16 _maxSizeOfInstructions; + uint16 _maxComponentElemets; + uint16 _maxComponentDepth; + +public: + MaxpTable1Dot0() : MaxpTable(0x00010000), _maxComponentDepth(0), _maxComponentElemets(0), _maxCompositeContours(0), + _maxCompositePoints(0), _maxContours(0), _maxFunctionDefs(0), _maxInstructionDefs(0), + _maxPoints(0), _maxSizeOfInstructions(0), _maxStackElements(0), _maxStorage(0), + _maxTwilightPoints(0), _maxZones(0) {}; + ~MaxpTable1Dot0() {}; + MaxpTable1Dot0(reader *rd) { read(rd); } + void read(reader *rd) + { + MaxpTable::read(rd); + _maxPoints = rd->readUint16(); + _maxContours = rd->readUint16(); + _maxCompositePoints = rd->readUint16(); + _maxCompositeContours = rd->readUint16(); + _maxZones = rd->readUint16(); + _maxTwilightPoints = rd->readUint16(); + _maxStorage = rd->readUint16(); + _maxFunctionDefs = rd->readUint16(); + _maxInstructionDefs = rd->readUint16(); + _maxStackElements = rd->readUint16(); + _maxSizeOfInstructions = rd->readUint16(); + _maxComponentElemets = rd->readUint16(); + _maxComponentDepth = rd->readUint16(); + } + uint16 maxPoints() { return _maxPoints; } + uint16 maxContours() { return _maxContours; } + uint16 maxCompositePoints() { return _maxCompositePoints; } + uint16 maxCompositeContours() { return _maxCompositeContours; } + uint16 maxZones() { return _maxZones; } + uint16 maxTwilightPoints() { return _maxTwilightPoints; } + uint16 maxStorage() { return _maxStorage; } + uint16 maxFunctionDefs() { return _maxFunctionDefs; } + uint16 maxInstructionDefs() { return _maxInstructionDefs; } + uint16 maxStackElements() { return _maxStackElements; } + uint16 maxSizeOfInstructions() { return _maxSizeOfInstructions; } + uint16 maxComponentElemets() { return _maxComponentElemets; } + uint16 maxComponentDepth() { return _maxComponentDepth; } +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/name/name.cpp b/cpp/fonts/core/tables/name/name.cpp new file mode 100644 index 0000000..90037c4 --- /dev/null +++ b/cpp/fonts/core/tables/name/name.cpp @@ -0,0 +1,58 @@ +#include "name.h" +#include "../reader/buffer.h" +#include + +NameTable::NameTable(reader *rd, uint16_t length){ + read(rd, length); +} + +void NameTable::readHeader(reader* rd){ + header.read(rd); +} + +void NameTable::read(reader* rd, uint16_t length){ + header.read(rd); //read header + + for(auto i = 0; iseek(header.getStorageOffset())){ + throw "file len too low"; + } + auto len = length - header.getStorageOffset(); + auto data = rd->readString(len); + buffer storageReader(data); + for(auto it : header.getNameRecords()){ + readName(&storageReader, it); + } +} + + +void NameTable::readRecord(reader* rd){ + nameRecord nr; + nr.platformId = rd->readUint16(); + nr.encodingId = rd->readUint16(); + nr.languageId = rd->readUint16(); + nr.nameId = rd->readUint16(); + nr.length = rd->readUint16(); + nr.offset = rd->readUint16(); + nr.display(); + header.addNameRecord(nr); +} + +void NameTable::readName(reader* rd, nameRecord nr){ + if(!rd->seek(nr.offset)){ + return; + } + + std::string s = rd->readString(nr.length); + names[nr.nameId] = s; +} + +void NameTable::display(){ + std::cout<<"this is the name infomation of the font:"< +#include +#include +#include +#include "../../../reader/reader.h" +#include "name_head.h" + + + +class NameTable +{ +private: + uint16_t offset; + uint16_t len; + nameTableHeader header; + std::map names; + +public: + NameTable():offset(0),len(0),header(),names({}){}; + ~NameTable() {}; + NameTable(reader *, uint16_t); + void readHeader(reader*); + void read(reader *, uint16_t); + void readRecord(reader *); + void display(); + void readName(reader*, nameRecord); +}; +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/name/name_head.cpp b/cpp/fonts/core/tables/name/name_head.cpp new file mode 100644 index 0000000..42e2eed --- /dev/null +++ b/cpp/fonts/core/tables/name/name_head.cpp @@ -0,0 +1,40 @@ +#include "name_head.h" +#include +void nameTableHeader::display() +{ + std::cout << "the header of name table:" << std::endl; + std::cout << "version:" << version << "\trecordsCount:" << recordsCount << "\tstorageOffset:" << storageOffset << std::endl; + std::cout<<"langTags: "<readUint16(); + recordsCount = rd->readUint16(); + storageOffset = rd->readUint16(); + // read language tag + if (version == 1) + { + langTagCount = rd->readUint16(); + for (auto i = 0; i < langTagCount; i++) + { + // + readLangTag(rd); + } + } +} + +void nameTableHeader::readLangTag(reader *rd) +{ + langTagRecord lt; + lt.length = rd->readUint16(); + lt.offset = rd->readUint16(); + langTagRecords.push_back(lt); +} + +void nameTableHeader::addNameRecord(nameRecord nr){ + nameRecords.push_back(nr); +} \ No newline at end of file diff --git a/cpp/fonts/core/tables/name/name_head.h b/cpp/fonts/core/tables/name/name_head.h new file mode 100644 index 0000000..b6b2b17 --- /dev/null +++ b/cpp/fonts/core/tables/name/name_head.h @@ -0,0 +1,52 @@ +#ifndef __NAME_HEAD_H__ +#define __NAME_HEAD_H__ +// 表格式, apple only support ver 0 +#include +#include +#include "../../../reader/reader.h" +#include +// 名称记录 +class nameRecord +{ +public: + uint16_t platformId; + uint16_t encodingId; + uint16_t languageId; + uint16_t nameId; + uint16_t length; + uint16_t offset; + void display() + { + std::cout << "nameRecord: " << nameId <<" language: "< nameRecords; + uint16_t langTagCount; // only ver 1, apple not support + std::list langTagRecords; // only ver 1, apple not support +public: + nameTableHeader() : version(0), recordsCount(0), storageOffset(0), nameRecords(), langTagCount(0), langTagRecords() {}; + ~nameTableHeader() {}; + void display(); + uint16_t getVersion() { return version; }; + uint16_t getRecordCount() { return recordsCount; }; + uint16_t getStorageOffset() { return storageOffset; }; + std::list getNameRecords() { return nameRecords; }; + void read(reader *); + void readLangTag(reader *rd); + void addNameRecord(nameRecord); +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/name/name_id.h b/cpp/fonts/core/tables/name/name_id.h new file mode 100644 index 0000000..8b82305 --- /dev/null +++ b/cpp/fonts/core/tables/name/name_id.h @@ -0,0 +1,28 @@ +enum NameID { + Copyright, + FontFamily, + FontSubFamily, + UniqueFontID, + FullFontName, + Version, + PostScriptName, + Trademark, + ManufacturerName, + Designer, + Description, + VendorURL, + DesignerURL, + LicenseDescription, + LicenseInfoURL, + Reserved, + TypographicFamily, + TypographicSubFamily, + CompatibleFullName, //only macintosh + SampleText, + PostscriptCID, + WWSFamily, + WWSSubFamily, + LightBackgroundPallete, + DarkBackgroundPallete, + VariationScriptNamePrefix, +}; \ No newline at end of file diff --git a/cpp/fonts/core/tables/name/platform_id.h b/cpp/fonts/core/tables/name/platform_id.h new file mode 100644 index 0000000..571684c --- /dev/null +++ b/cpp/fonts/core/tables/name/platform_id.h @@ -0,0 +1,49 @@ +enum PlatformID { + Unicode, + Macintosh, + Reserved, + Microsoft, +}; + +enum UnicodePlatformSpecificID { + Version1dot0, + Version1dot1, + ISO10646, + Unicode2OnlyBMP, + Unicode2NoBMP +}; + +enum MacintoshPlatformSpecificID { + Roman, + Japanese, + TraditionalChinese, + Korean, + Arabic, + Hebrew, + Greek, + Russian, + RSymbol, + Devanagari, + Gurmukhi, + Gujarati, + Oriya, + Bengali, + Tamil, + Telugu, + Kannada, + Malayalam, + Sinhalese, + Burmese, + Thai, + Laotian, + Georgian, + Armenian, + SimplifiedChinese, + Tibetan, + Mongolian, + Geez, + Slavic, + Vietnamese, + Sindhi, + Uniterpreted, +}; \ No newline at end of file diff --git a/cpp/fonts/core/tables/table.cpp b/cpp/fonts/core/tables/table.cpp new file mode 100644 index 0000000..3503356 --- /dev/null +++ b/cpp/fonts/core/tables/table.cpp @@ -0,0 +1,90 @@ +#include "table.h" +#include "table_name.h" +#include "../reader/buffer.h" +#include +void FontTable::display() +{ + std::cout<<"table lists:"<display(); + break; + + default: + break; + } + } +} + +void FontTable::read(reader *rd, uint16_t count) +{ + for (auto i = 0; i < count; i++) + { + table t; + t.name = rd->readString(4); + t.sum = rd->readUint32(); + t.offset = rd->readUint32(); + t.length = rd->readUint32(); + _tables.push_back(t); + } + //读取表详情 + for (auto it: _tables) + { + auto iter = tableNameMap.find(it.name); + if (iter == tableNameMap.end()) + { + continue; + } + auto id = (*iter).second; + switch (id) + { + case tableName::name: + { + if(!rd->seek(it.offset)){ + throw "seek file failed"; + }; + auto data = rd->readString(it.length); + buffer nameReader(data); + _name = new NameTable(); + _name->read(&nameReader, it.length); + } + break; + case tableName::cmap: + { + + break; + } + case tableName::BASE: + { + break; + } + case tableName::head: + { + break; + } + case tableName::maxp: + { + break; + } + case tableName::glyf: + { + break; + } + default: + break; + } + } +} + +std::vector FontTable::tables(){ + return _tables; +} \ No newline at end of file diff --git a/cpp/fonts/core/tables/table.h b/cpp/fonts/core/tables/table.h new file mode 100644 index 0000000..445ebbf --- /dev/null +++ b/cpp/fonts/core/tables/table.h @@ -0,0 +1,65 @@ +#ifndef __TABLE_H__ +#define __TABLE_H__ +#include "name/name.h" +#include "../../reader/reader.h" +#include +#include "cmap/cmap.h" +#include "base/base.h" +#include "glyf/glyf.h" +#include "head/head.h" +#include "name/name.h" +#include "loca/loca.h" +#include "maxp/maxp.h" +struct table +{ + std::string name; + uint32_t sum; + uint32_t offset; + uint32_t length; +}; + + +class FontTable +{ +private: + std::vector
_tables; + HeadTable* _head; + NameTable* _name; + BaseHeader1* _base; + CmapTable* _cmap; + MaxpTable* _maxp; + LocaTable* _loca; + +public: + FontTable(){}; + ~FontTable(){ + if(_head!=nullptr){ + delete _head; + } + if(_name != nullptr){ + delete _name; + } + if(_base != nullptr){ + delete _base; + } + if(_cmap!= nullptr){ + delete _cmap; + } + if(_maxp!=nullptr){ + delete _maxp; + } + if(_loca!=nullptr){ + delete _loca; + } + }; + void display(); + void read(reader*, uint16_t); + std::vector
tables(); +}; + + + + + + +#endif \ No newline at end of file diff --git a/cpp/fonts/core/tables/table_name.h b/cpp/fonts/core/tables/table_name.h new file mode 100644 index 0000000..8e2772b --- /dev/null +++ b/cpp/fonts/core/tables/table_name.h @@ -0,0 +1,164 @@ +#ifndef __TABLE_NAME_H__ +#define __TABLE_NAME_H__ +#include +#include + + +#define TABLE_NAME_OS2 = "OS/2" +#define TABLE_NAME_NAME = "name" +#define TABLE_NAME_AVAR = "avar" +#define TABLE_NAME_BASE = "BASE" +#define TABLE_NAME_CBDT = "CBDT" +#define TABLE_NAME_CBLC = "CBLC" +#define TABLE_NAME_CFF = "CFF" +#define TABLE_NAME_CFF2 = "CFF2" +#define TABLE_NAME_CMAP = "cmap" +#define TABLE_NAME_COLR = "COLR" +#define TABLE_NAME_CPAL = "CPAL" +#define TABLE_NAME_CVAR = "cvar" +#define TABLE_NAME_CVT = "cvt" +#define TABLE_NAME_DSIG = "DSIG" +#define TABLE_NAME_EBDT = "EBDT" +#define TABLE_NAME_EBLC = "EBLC" +#define TABLE_NAME_EBSC = "EBSC" +#define TABLE_NAME_FPGM = "fpgm" +#define TABLE_NAME_FVAR = "fvar" +#define TABLE_NAME_GASP = "gasp" +#define TABLE_NAME_GDEF = "GDEF" +#define TABLE_NAME_GLYF = "glyf" +#define TABLE_NAME_GPOS = "GPOS" +#define TABLE_NAME_GSUB = "GSUB" +#define TABLE_NAME_GVAR = "gvar" +#define TABLE_NAME_HDMX = "hdmx" +#define TABLE_NAME_HEAD = "head" +#define TABLE_NAME_HHEA = "hhea" +#define TABLE_NAME_HMTX = "hmtx" +#define TABLE_NAME_HVAR = "HVAR" +#define TABLE_NAME_JSTF = "JSTF" +#define TABLE_NAME_KERN = "kern" +#define TABLE_NAME_LOCA = "loca" +#define TABLE_NAME_LTSH = "LTSH" +#define TABLE_NAME_MATH = "MATH" +#define TABLE_NAME_MAXP = "maxp" +#define TABLE_NAME_MERG = "MERG" +#define TABLE_NAME_META = "meta" +#define TABLE_NAME_MVAR = "MVAR" +#define TABLE_NAME_PCLT = "PCLT" +#define TABLE_NAME_POST = "post" +#define TABLE_NAME_PREP = "prep" +#define TABLE_NAME_SBIX = "sbix" +#define TABLE_NAME_STAT = "STAT" +#define TABLE_NAME_SVG = "SVG" +#define TABLE_NAME_VDMX = "VDMX" +#define TABLE_NAME_VHEA = "vhea" +#define TABLE_NAME_VMTX = "vmtx" +#define TABLE_NAME_VORG = "VORG" +#define TABLE_NAME_VVAR = "VVAR" + +enum tableName +{ + os2, + name, + avar, + BASE, + CBDT, + CBLC, + CFF, + CFF2, + cmap, + COLR, + CPAL, + cvar, + cvt, + DSIG, + EBDT, + EBLC, + EBSC, + fpgm, + fvar, + gasp, + GDEF, + glyf, + GPOS, + GSUB, + gvar, + hdmx, + head, + hhea, + hmtx, + HVAR, + JSTF, + kern, + loca, + LTSH, + MATH, + maxp, + MERG, + meta, + MVAR, + PCLT, + post, + prep, + sbix, + STAT, + SVG, + VDMX, + vhea, + vmtx, + VORG, + VVAR, +}; + +const static std::map tableNameMap = { + {"OS/2", os2}, + {"name", name}, + {"avar", avar}, + {"BASE", BASE}, + {"CBDT", CBDT}, + {"CBLC", CBLC}, + {"CFF", CFF}, + {"CFF2", CFF2}, + {"cmap", cmap}, + {"COLR", COLR}, + {"CPAL", CPAL}, + {"cvar", cvar}, + {"cvt", cvt}, + {"DSIG", DSIG}, + {"EBDT", EBDT}, + {"EBLC", EBLC}, + {"EBSC", EBSC}, + {"fpgm", fpgm}, + {"fvar", fvar}, + {"gasp", gasp}, + {"GDEF", GDEF}, + {"glyf", glyf}, + {"GPOS", GPOS}, + {"GSUB", GSUB}, + {"gvar", gvar}, + {"hdmx", hdmx}, + {"head", head}, + {"hhea", hhea}, + {"hmtx", hmtx}, + {"HVAR", HVAR}, + {"JSTF", JSTF}, + {"kern", kern}, + {"loca", loca}, + {"LTSH", LTSH}, + {"MATH", MATH}, + {"maxp", maxp}, + {"MERG", MERG}, + {"meta", meta}, + {"MVAR", MVAR}, + {"PCLT", PCLT}, + {"post", post}, + {"prep", prep}, + {"sbix", sbix}, + {"STAT", STAT}, + {"SVG", SVG}, + {"VDMX", VDMX}, + {"vhea", vhea}, + {"vmtx", vmtx}, + {"VORG", VORG}, + {"VVAR", VVAR}, +}; +#endif \ No newline at end of file diff --git a/cpp/fonts/core/types/types.h b/cpp/fonts/core/types/types.h new file mode 100644 index 0000000..9fa1e64 --- /dev/null +++ b/cpp/fonts/core/types/types.h @@ -0,0 +1,173 @@ +#ifndef __FONT_TYPES_H__ +#define __FONT_TYPES_H__ +#include +#include +#include +#include +#include +#define uint8 uint8_t +#define uint16 uint16_t +#define uint32 uint32_t +#define int8 int8_t +#define int16 int16_t +#define int32 int32_t +#define FWORD int16_t +#define UFWORD uint16_t +#define LONGDATETIME uint64_t +#define Offset8 uint8_t +#define Offset16 uint16_t +#define Offset24 uint24_t +#define Offset32 uint32_t +#define uint24 uint24_t +#define int24 int24_t + +class uint24_t +{ +private: + uint32 _value; + +public: + uint24_t() : _value(0) {}; + ~uint24_t() {}; + explicit uint24_t(uint32 i) : _value(i & 0xFFFFFF) {}; + operator uint32_t() const { return _value; }; + +public: + friend std::ostream &operator<<(std::ostream &os, const uint24_t &u) + { + return os << u._value; + }; + friend std::istream &operator>>(std::istream &in, uint24_t &u) + { + uint8_t bytes[3]; + in.read(reinterpret_cast(bytes), 3); + uint32_t ret = (static_cast(bytes[2]) << 16) | (static_cast(bytes[1]) << 8) | static_cast(bytes[0]); + u._value = ret & 0xFFFFFF; + return in; + }; + + uint24_t operator+(const uint24_t &o) const + { + return uint24_t(_value + o._value); + } + uint24_t operator-(const uint24_t &o) const + { + return uint24_t(_value - o._value); + } +}; + +class int24_t +{ +private: + int32 _value; + +public: + int24_t() : _value(0) {}; + ~int24_t() {}; + explicit int24_t(uint32 i) : _value(i & 0xFFFFFF) {}; + operator int32_t() const { return _value; }; + +public: + friend std::ostream &operator<<(std::ostream &os, const int24_t &u) + { + return os << u._value; + }; + friend std::istream &operator>>(std::istream &in, int24_t &u) + { + int8_t bytes[3]; + in.read(reinterpret_cast(bytes), 3); + int32_t ret = (static_cast(bytes[2]) << 16) | (static_cast(bytes[1]) << 8) | static_cast(bytes[0]); + u._value = ret & 0xFFFFFF; + return in; + }; + + int24_t operator+(const int24_t &o) const + { + return int24_t(_value + o._value); + } + int24_t operator-(const int24_t &o) const + { + return int24_t(_value - o._value); + } +}; + + +class Fixed +{ +private: + int16 _num1; + int16 _num2; + +public: + Fixed():_num1(0),_num2(0){}; + ~Fixed(){}; + friend std::ostream &operator<<(std::ostream& out, const Fixed& f){ + return out<>(std::istream& in, Fixed& f){ + return in>>f._num1>>f._num2; + } +}; + +// 16-bit signed fixed number with the low 14 bits of fraction (2.14). +class F2DOT14 +{ +private: + uint16 _value; + uint8 _integer; + uint16 _fraction; + +public: + F2DOT14():_value(0){}; + ~F2DOT14(){}; + friend std::ostream &operator<<(std::ostream& out, const F2DOT14& f){ + return out<>(std::istream& in, F2DOT14& f){ + in>>f._value; + f._integer = f._value >>14 ; + f._fraction = f._value<<2 ; + return in; + } +}; + +class Tag +{ +private: + uint8 _byte1; + uint8 _byte2; + uint8 _byte3; + uint8 _byte4; + +public: + Tag():_byte1(0),_byte2(0),_byte3(0), _byte4(0){}; + ~Tag(){}; + friend std::ostream &operator<<(std::ostream& out, const Tag& t){ + return out<>(std::istream& in, Tag& t){ + in>>t._byte1>>t._byte2>>t._byte3>>t._byte4; + return in; + } +}; + +class Version16Dot16 +{ +private: + uint16 _majorVersion; + uint16 _minorVersion; +public: + Version16Dot16():_majorVersion(0),_minorVersion(0){}; + Version16Dot16(uint32 n):_majorVersion(n>>16 & 0xFFFF),_minorVersion(n<<16>>16 &0xFFFF){}; + ~Version16Dot16(){}; + friend std::ostream &operator<<(std::ostream& out, const Version16Dot16& f){ + return out<>(std::istream& in, Version16Dot16& f){ + in>>f._majorVersion>>f._minorVersion; + return in; + } + +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/ft_math/ft_math.h b/cpp/fonts/ft_math/ft_math.h new file mode 100644 index 0000000..9efb020 --- /dev/null +++ b/cpp/fonts/ft_math/ft_math.h @@ -0,0 +1,14 @@ +#ifndef __FONT_MATH_H__ +#define __FONT_MATH_H__ +#include +uint16_t highestBitValue(uint16_t x) { + if (x == 0) return 0; + uint16_t n = 0; + while (x > 1) { + x >>= 1; + n++; + } + return 1U << n; +} + +#endif \ No newline at end of file diff --git a/cpp/fonts/main.cpp b/cpp/fonts/main.cpp new file mode 100644 index 0000000..733d409 --- /dev/null +++ b/cpp/fonts/main.cpp @@ -0,0 +1,13 @@ +#include "reader/file.h" +#include "core/font.h" + +int main(int argc, char const *argv[]) +{ + /* code */ + const char* fontFile = "/home/kun1h/fonts/fzmw.ttf"; + file rd(fontFile); + font font; + font.read(&rd); + font.display(); + return 0; +} diff --git a/cpp/fonts/reader/CMakeLists.txt b/cpp/fonts/reader/CMakeLists.txt new file mode 100644 index 0000000..2a4ca97 --- /dev/null +++ b/cpp/fonts/reader/CMakeLists.txt @@ -0,0 +1,10 @@ +set (SOURCE +reader.h +file.h +file.cpp +buffer.h +buffer.cpp +) + +project(fonts) +add_library(reader SHARED ${SOURCE}) diff --git a/cpp/fonts/reader/buffer.cpp b/cpp/fonts/reader/buffer.cpp new file mode 100644 index 0000000..5a03993 --- /dev/null +++ b/cpp/fonts/reader/buffer.cpp @@ -0,0 +1,146 @@ +#include "buffer.h" +#include +#include +#include "endian.h" + + +buffer::buffer(std::string data) +{ + fp = std::stringstream(data); + length = data.length(); +}; + +std::streamsize buffer::read(char *bytes, uint16_t l) +{ + fp.read(reinterpret_cast(bytes), l); + std::streamsize bytesRead = fp.gcount(); + return bytesRead; +}; +int8_t buffer::readInt8() +{ + int8_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +} + +int16_t buffer::readInt16() +{ + int16_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +}; + +int32_t buffer::readInt32() +{ + int32_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +} + +int64_t buffer::readInt64() +{ + uint64_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +} + +uint8_t buffer::readUint8() +{ + uint8_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return ret; +} + +uint16_t buffer::readUint16() +{ + uint16_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +}; + +uint24_t buffer::readUint24(){ + uint24_t ret(0); + fp>>ret; + return ret; +} + +uint32_t buffer::readUint32() +{ + uint32_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe32(ret); +} + +uint64_t buffer::readUint64() +{ + uint64_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe64(ret); +} + +std::string buffer::readString(int l) +{ + char *data = new char[l]; + fp.read(data, l); + std::streamsize bytesRead = fp.gcount(); + auto ret = std::string(data, bytesRead); + delete[] data; + return ret; +} +FWORD buffer::readFWord(){ + return readInt16(); +} +UFWORD buffer::readUFWord(){ + return readUint16(); +} +Offset8 buffer::readOffset8(){ + return readUint8(); +} +Offset16 buffer::readOffset16(){ + return readUint16(); +} +Offset24 buffer::readOffset24(){ + return readUint24(); +} +Offset32 buffer::readOffset32(){ + return readUint32(); +} +int24_t buffer::readInt24(){ + int24_t i; + fp>>i; + return i; +} +Fixed buffer::readFixed(){ + Fixed f; + fp>>f; + return f; +} +F2DOT14 buffer::readF2Dot14(){ + F2DOT14 f; + fp>>f; + return f; +} +Version16Dot16 buffer::readVersion16Dot16(){ + Version16Dot16 v; + fp>>v; + return v; +} +Tag buffer::readTag(){ + Tag t; + fp>>t; + return t; +} +bool buffer::seek(int64_t i) +{ + if (i > length) + { + return false; + } + fp.seekg(i); + return true; +} + +std::streampos buffer::curr() +{ + return fp.tellg(); +} \ No newline at end of file diff --git a/cpp/fonts/reader/buffer.h b/cpp/fonts/reader/buffer.h new file mode 100644 index 0000000..61add92 --- /dev/null +++ b/cpp/fonts/reader/buffer.h @@ -0,0 +1,44 @@ +#ifndef __READER_BUFFER_H__ +#define __READER_BUFFER_H__ +#include "reader.h" +#include + +class buffer : public reader +{ +private: + std::stringstream fp; + std::streampos length; + +public: + buffer(/* args */) : length(0) {}; + ~buffer() {}; + buffer(std::string data); + std::streamsize read(char *, uint16_t) override; + int8_t readInt8() override; + int16_t readInt16() override; + int32_t readInt32() override; + int64_t readInt64() override; + uint8_t readUint8() override; + uint16_t readUint16() override; + uint32_t readUint32() override; + uint64_t readUint64() override; + std::string readString(int) override; + bool seek(int64_t) override; + std::streampos curr() override; + std::string getPath() override { return ""; }; + std::streampos getLength() override { return length; }; + uint24_t readUint24() override; + FWORD readFWord() override; + UFWORD readUFWord() override; + Offset8 readOffset8() override; + Offset16 readOffset16() override; + Offset24 readOffset24() override; + Offset32 readOffset32() override; + int24_t readInt24() override; + Fixed readFixed() override; + F2DOT14 readF2Dot14() override; + Version16Dot16 readVersion16Dot16() override; + Tag readTag() override; +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/reader/file.cpp b/cpp/fonts/reader/file.cpp new file mode 100644 index 0000000..b69e778 --- /dev/null +++ b/cpp/fonts/reader/file.cpp @@ -0,0 +1,174 @@ +#include "file.h" +#include +#include +#include + +file::file(const char *filePath) : reader() +{ + fp.open(filePath, std::ios::binary); + if (!fp.is_open()) + { + throw "file now open"; + } + path = new char[std::strlen(filePath)]; + std::memcpy(path, filePath, std::strlen(filePath)); + fp.seekg(0, fp.end); + length = fp.tellg(); + fp.seekg(0, fp.beg); +}; + +std::streamsize file::read(char *bytes, uint16_t l) +{ + fp.read(bytes, l); + std::streamsize bytesRead = fp.gcount(); + return bytesRead; +}; + +int8_t file::readInt8() +{ + int8_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +} + +int16_t file::readInt16() +{ + int16_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +}; + +int32_t file::readInt32() +{ + int32_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +} + +int64_t file::readInt64() +{ + uint64_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +} + +uint8_t file::readUint8() +{ + uint8_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return ret; +} + +uint16_t file::readUint16() +{ + uint16_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe16(ret); +}; + +uint24_t file::readUint24() +{ + uint24_t ret(0); + fp >> ret; + return ret; +} + +uint32_t file::readUint32() +{ + uint32_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe32(ret); +} + +uint64_t file::readUint64() +{ + uint64_t ret = 0; + fp.read(reinterpret_cast(&ret), sizeof(ret)); + return htobe64(ret); +} + +std::string file::readString(int l) +{ + char *data = new char[l]; + fp.read(data, l); + std::streamsize bytesRead = fp.gcount(); + auto ret = std::string(data, bytesRead); + delete[] data; + return ret; +} + +FWORD file::readFWord(){ + return readInt16(); +} +UFWORD file::readUFWord(){ + return readUint16(); +} +Offset8 file::readOffset8(){ + return readUint8(); +} +Offset16 file::readOffset16(){ + return readUint16(); +} +Offset24 file::readOffset24(){ + return readUint24(); +} +Offset32 file::readOffset32(){ + return readUint32(); +} +int24_t file::readInt24(){ + int24_t i; + fp>>i; + return i; +} +Fixed file::readFixed(){ + Fixed f; + fp>>f; + return f; +} +F2DOT14 file::readF2Dot14(){ + F2DOT14 f; + fp>>f; + return f; +} +Version16Dot16 file::readVersion16Dot16(){ + Version16Dot16 v; + fp>>v; + return v; +} +Tag file::readTag(){ + Tag t; + fp>>t; + return t; +} + +bool file::seek(int64_t i) +{ + if (i > length) + { + return false; + } + fp.seekg(i); + return true; +} + +std::streampos file::curr() +{ + return fp.tellg(); +} + +std::string file::getPath() +{ + return path; +} + +file::~file() +{ + if (fp.is_open()) + { + fp.close(); + } + if (path != nullptr) + { + delete path; + } +} \ No newline at end of file diff --git a/cpp/fonts/reader/file.h b/cpp/fonts/reader/file.h new file mode 100644 index 0000000..3debb0b --- /dev/null +++ b/cpp/fonts/reader/file.h @@ -0,0 +1,45 @@ +#ifndef __READER_FILE_H__ +#define __READER_FILE_H__ +#include "reader.h" +#include + +class file : public reader +{ +private: + std::ifstream fp; + char *path; + std::streampos length; + +public: + file() : path(nullptr), length(0), fp() {}; + ~file(); + file(const char *filePath); + std::streamsize read(char *, uint16_t) override; + int8_t readInt8() override; + int16_t readInt16() override; + int32_t readInt32() override; + int64_t readInt64() override; + uint8_t readUint8() override; + uint16_t readUint16() override; + uint32_t readUint32() override; + uint64_t readUint64() override; + std::string readString(int) override; + bool seek(int64_t) override; + std::streampos curr() override; + std::string getPath() override; + std::streampos getLength() override { return length; }; + uint24_t readUint24() override; + FWORD readFWord() override; + UFWORD readUFWord() override; + Offset8 readOffset8() override; + Offset16 readOffset16() override; + Offset24 readOffset24() override; + Offset32 readOffset32() override; + int24_t readInt24() override; + Fixed readFixed() override; + F2DOT14 readF2Dot14() override; + Version16Dot16 readVersion16Dot16() override; + Tag readTag() override; +}; + +#endif \ No newline at end of file diff --git a/cpp/fonts/reader/reader.h b/cpp/fonts/reader/reader.h new file mode 100644 index 0000000..a5f01f4 --- /dev/null +++ b/cpp/fonts/reader/reader.h @@ -0,0 +1,41 @@ +#ifndef __READER_H__ +#define __READER_H__ + +#include +#include +#include "../types/types.h" +class reader +{ +private: +public: + reader(/* args */) {}; + virtual ~reader() {}; + virtual std::streamsize read(char *, uint16_t) = 0; + virtual int8_t readInt8() = 0; + virtual int16_t readInt16() = 0; + virtual int32_t readInt32() = 0; + virtual int64_t readInt64() = 0; + virtual uint8_t readUint8() = 0; + virtual uint16_t readUint16() = 0; + virtual uint32_t readUint32() = 0; + virtual uint64_t readUint64() = 0; + virtual std::string readString(int) = 0; + virtual bool seek(int64_t) = 0; + virtual std::streampos curr() = 0; + virtual std::string getPath() = 0; + virtual std::streampos getLength() = 0; + virtual uint24_t readUint24() = 0; + virtual Tag readTag() = 0; + virtual FWORD readFWord() = 0; + virtual UFWORD readUFWord() = 0; + virtual Offset8 readOffset8() = 0; + virtual Offset16 readOffset16() = 0; + virtual Offset24 readOffset24() = 0; + virtual Offset32 readOffset32() = 0; + virtual int24_t readInt24() = 0; + virtual Fixed readFixed() = 0; + virtual F2DOT14 readF2Dot14() = 0; + virtual Version16Dot16 readVersion16Dot16() = 0; +}; + +#endif \ No newline at end of file diff --git a/go.mod b/go.mod index 8624593..a4e5b41 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/coreos/go-oidc/v3 v3.1.0 github.com/gin-gonic/gin v1.8.1 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - github.com/spf13/cobra v1.3.0 + github.com/spf13/cobra v1.7.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 k8s.io/api v0.23.1 k8s.io/apimachinery v0.23.1 @@ -17,42 +17,60 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.2.0 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-json v0.9.7 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/google/go-cmp v0.5.6 // indirect - github.com/google/gofuzz v1.1.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/googleapis/gnostic v0.5.5 // indirect - github.com/imdario/mergo v0.3.5 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/imdario/mergo v0.3.13 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/ugorji/go/codec v1.2.7 // indirect + github.com/xlab/treeprint v1.2.0 // indirect + go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect - golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect - golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect - golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect + golang.org/x/net v0.4.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.3.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/klog/v2 v2.30.0 // indirect - k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect - k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect - sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect - sigs.k8s.io/yaml v1.2.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 // indirect + k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/kustomize/api v0.16.0 // indirect + sigs.k8s.io/kustomize/cmd/config v0.13.0 // indirect + sigs.k8s.io/kustomize/kustomize/v5 v5.3.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 0be41af..73cab5c 100644 --- a/go.sum +++ b/go.sum @@ -103,6 +103,7 @@ github.com/coreos/go-oidc/v3 v3.1.0/go.mod h1:rEJ/idjfUyfkBit1eI1fvyr+64/g9dcKpA github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -137,6 +138,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -150,8 +153,14 @@ github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -199,10 +208,14 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -216,9 +229,13 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -238,6 +255,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= @@ -286,8 +305,14 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -316,6 +341,8 @@ github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc8 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -346,6 +373,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= @@ -361,6 +390,7 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= @@ -371,6 +401,7 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -409,6 +440,8 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -416,6 +449,8 @@ github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -424,12 +459,17 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= +github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -446,6 +486,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= +go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= @@ -472,6 +514,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -545,6 +589,8 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -594,6 +640,7 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -646,9 +693,13 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -659,6 +710,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -724,6 +777,7 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -871,6 +925,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -879,6 +935,8 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v5 v5.6.0 h1:BMT6KIwBD9CaU91PJCZIe46bDmBWa9ynTQgJIOpfQBk= +gopkg.in/evanphx/json-patch.v5 v5.6.0/go.mod h1:/kvTRh1TVm5wuM6OkHxqXtE/1nUZZpihg29RtuIyfvk= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -900,6 +958,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -918,18 +979,34 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA= +k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/kustomize/api v0.16.0 h1:/zAR4FOQDCkgSDmVzV2uiFbuy9bhu3jEzthrHCuvm1g= +sigs.k8s.io/kustomize/api v0.16.0/go.mod h1:MnFZ7IP2YqVyVwMWoRxPtgl/5hpA+eCCrQR/866cm5c= +sigs.k8s.io/kustomize/cmd/config v0.13.0 h1:Z/bRyFQupMIqGz1KlRkLimK/VjtE4/Oj/DinJmQqTDc= +sigs.k8s.io/kustomize/cmd/config v0.13.0/go.mod h1:YlsZ9JysiHN7OjSmIZ17zvq9kl1oN2Osn+3wVyERkcM= +sigs.k8s.io/kustomize/kustomize/v5 v5.3.0 h1:OUKaQwArd1udTz3ykibOjaUwdfly6FnkQiDSSft6+Fg= +sigs.k8s.io/kustomize/kustomize/v5 v5.3.0/go.mod h1:qGalrWojwFYaT7KQXLo3kmLyuyr6VaIQYY+BWeRENus= +sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0= +sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/go/fonts/font/font.go b/go/fonts/font/font.go new file mode 100644 index 0000000..7f90776 --- /dev/null +++ b/go/fonts/font/font.go @@ -0,0 +1,7 @@ +package font + + + +type Font struct{ + Head Head `json:"head"` +} \ No newline at end of file diff --git a/go/fonts/font/head.go b/go/fonts/font/head.go new file mode 100644 index 0000000..8df1111 --- /dev/null +++ b/go/fonts/font/head.go @@ -0,0 +1,10 @@ +package font + +type Head struct { + Version string `json:"version"` + TableCount uint16 `json:"tableCount"` + Tables []Table `json:"tables"` + SearchRange uint16 `json:"searchRange"` + EntrySelector uint16 `json:"entrySelector"` + RangeShift uint16 `json:"rangeShift"` +} diff --git a/go/fonts/font/reader.go b/go/fonts/font/reader.go new file mode 100644 index 0000000..acba256 --- /dev/null +++ b/go/fonts/font/reader.go @@ -0,0 +1,170 @@ +package font + +import ( + "bytes" + "encoding/binary" + "io" + "os" +) + +type Reader interface { + Read([]byte) (int, error) + Close() error + ReadInt8() (int8, error) + ReadInt16() (int16, error) + ReadInt32() (int32, error) + ReadInt64() (int64, error) + ReadUint8() (uint8, error) + ReadUint16() (uint16, error) + ReadUint32() (uint32, error) + ReadUint64() (uint64, error) + ReadString(int) (string, error) + ReadBytes(int) ([]byte, error) + Seek(int64, int) (int64, error) + Size() (int64, error) +} + +type reader struct { + path string + fp *os.File +} + +func NewReader(file string) (Reader, error) { + fp, err := os.OpenFile(file, os.O_RDONLY, os.ModePerm) + if err != nil { + return nil, err + } + r := &reader{ + fp: fp, + path: file, + } + return r, nil +} + +func (r *reader) Read(p []byte) (int, error) { + if r.fp == nil { + return 0, nil + } + return r.fp.Read(p) +} + +func (r *reader) Close() error { + if r.fp != nil { + return r.fp.Close() + } + return nil +} + +func (r *reader) ReadCloser() io.ReadCloser { + return r +} + +func (r *reader) ReadInt8() (int8, error) { + buff := make([]byte, 1) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int8(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func (r *reader) ReadInt16() (int16, error) { + buff := make([]byte, 2) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int16(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func (r *reader) ReadInt32() (int32, error) { + buff := make([]byte, 4) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int32(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func (r *reader) ReadInt64() (int64, error) { + buff := make([]byte, 8) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int64(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func (r *reader) ReadUint8() (uint8, error) { + buff := make([]byte, 1) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + return uint8(buff[0]), nil +} + +func (r *reader) ReadUint16() (uint16, error) { + buff := make([]byte, 2) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + return binary.BigEndian.Uint16(buff), nil +} + +func (r *reader) ReadUint32() (uint32, error) { + buff := make([]byte, 4) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + return binary.BigEndian.Uint32(buff), nil +} + +func (r *reader) ReadUint64() (uint64, error) { + buff := make([]byte, 8) + _, err := r.fp.Read(buff) + if err != nil { + return 0, err + } + return binary.BigEndian.Uint64(buff), nil +} + +func (r *reader) ReadString(len int) (string, error) { + buff := make([]byte, len) + _, err := r.fp.Read(buff) + if err != nil { + return "", err + } + return string(buff), nil +} + +func (r *reader) ReadBytes(len int) ([]byte, error) { + buff := make([]byte, len) + _, err := r.fp.Read(buff) + if err != nil { + return []byte{}, err + } + return buff, nil +} + +func (r *reader) Seek(offset int64, whence int) (int64, error) { + return r.fp.Seek(offset, whence) +} + +func (r *reader) Size() (int64, error) { + fi, err := r.fp.Stat() + if err != nil { + return 0, err + } + return fi.Size(), nil +} diff --git a/go/fonts/font/table.go b/go/fonts/font/table.go new file mode 100644 index 0000000..a20c684 --- /dev/null +++ b/go/fonts/font/table.go @@ -0,0 +1,8 @@ +package font + +type Table struct { + Name string `json:"name"` + Sum uint32 `json:"sum"` + Offset uint32 `json:"offset"` + Length uint32 `json:"length"` +} diff --git a/go/fonts/font/table_name.go b/go/fonts/font/table_name.go new file mode 100644 index 0000000..ef70073 --- /dev/null +++ b/go/fonts/font/table_name.go @@ -0,0 +1,111 @@ +package font + +const ( + PlatformIDUnicode = iota + PlatformIDMacintosh + PlatformIDReserved + PlatformIDMicrosoft +) + +const ( + UnicodePlatformSpecificIDVer1dot0 = iota + UnicodePlatformSpecificIDVer1dot1 + UnicodePlatformSpecificIDISO10646 + UnicodePlatformSpecificIDUnicode2OnlyBMP + UnicodePlatformSpecificIDUnicode2NoBMP +) + +const ( + MacintoshPlatformSpecificIDRoman = iota + MacintoshPlatformSpecificIDJapanese + MacintoshPlatformSpecificIDTraditionalChinese + MacintoshPlatformSpecificIDKorean + MacintoshPlatformSpecificIDArabic + MacintoshPlatformSpecificIDHebrew + MacintoshPlatformSpecificIDGreek + MacintoshPlatformSpecificIDRussian + MacintoshPlatformSpecificIDRSymbol + MacintoshPlatformSpecificIDDevanagari + MacintoshPlatformSpecificIDGurmukhi + MacintoshPlatformSpecificIDGujarati + MacintoshPlatformSpecificIDOriya + MacintoshPlatformSpecificIDBengali + MacintoshPlatformSpecificIDTamil + MacintoshPlatformSpecificIDTelugu + MacintoshPlatformSpecificIDKannada + MacintoshPlatformSpecificIDMalayalam + MacintoshPlatformSpecificIDSinhalese + MacintoshPlatformSpecificIDBurmese + MacintoshPlatformSpecificIDThai + MacintoshPlatformSpecificIDLaotian + MacintoshPlatformSpecificIDGeorgian + MacintoshPlatformSpecificIDArmenian + MacintoshPlatformSpecificIDSimplifiedChinese + MacintoshPlatformSpecificIDTibetan + MacintoshPlatformSpecificIDMongolian + MacintoshPlatformSpecificIDGeez + MacintoshPlatformSpecificIDSlavic + MacintoshPlatformSpecificIDVietnamese + MacintoshPlatformSpecificIDSindhi + MacintoshPlatformSpecificIDUniterpreted +) + +const ( + NameIDCopyright = iota + NameIDFontFamily + NameIDFontSubFamily + NameIDUniqueFontID + NameIDFullFontName + NameIDVersion + NameIDPostScriptName + NameIDTrademark + NameIDManufacturerName + NameIDDesigner + NameIDDescription + NameIDVendorURL + NameIDDesignerURL + NameIDLicenseDescription + NameIDLicenseInfoURL + NameIDReserved + NameIDTypographicFamily + NameIDTypographicSubFamily + NameIDCompatibleFullName //only mac + NameIDSampleText + NameIDPostscriptCID + NameIDWWSFamily + NameIDWWSSubFamily + NameIDLightBackgroundPallete + NameIDDarkBackgroundPallete + NameIDVariationScriptNamePrefix +) + +type NameTable struct { + Name string `json:"name"` + CopyRight string `json:"copyRight"` + Family string `json:"family"` + Style string `json:"style"` +} + + +type NameRecord struct{ + Platform uint16 + PlatformSpecific uint16 + Language uint16 + Name uint16 + Length uint16 + Offset uint16 +} + +type LangTagRecord struct{ + Length uint16 + Offset uint16 +} + +type NameTableFormat struct{ + Format uint16 + RecordsCount uint16 + StringOffset uint16 + NameRecords []NameRecord + LangTagCount uint16 //only ver 1, apple not support + LangTagRecords []LangTagRecord //only ver 1, apple not support +} \ No newline at end of file diff --git a/go/fonts/main.go b/go/fonts/main.go new file mode 100644 index 0000000..4e7178f --- /dev/null +++ b/go/fonts/main.go @@ -0,0 +1,217 @@ +package main + +import ( + "bytes" + "encoding/binary" + "fmt" + "os" +) + +func readInt8(fp *os.File)(int8, error){ + buff := make([]byte, 1) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int8(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func readInt16(fp *os.File)(int16, error){ + buff := make([]byte, 2) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int16(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func readInt32(fp *os.File)(int32, error){ + buff := make([]byte, 4) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int32(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func readInt64(fp *os.File)(int64, error){ + buff := make([]byte, 8) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + reader := bytes.NewReader(buff) + n := int64(0) + return n, binary.Read(reader, binary.LittleEndian, &n) +} + +func readUint8(fp *os.File)(uint8, error){ + buff := make([]byte, 1) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + return uint8(buff[0]), nil +} + +func readUint16(fp *os.File)(uint16, error){ + buff := make([]byte, 2) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + return binary.BigEndian.Uint16(buff), nil +} + +func readUint32(fp *os.File)(uint32, error){ + buff := make([]byte, 4) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + return binary.BigEndian.Uint32(buff), nil +} + +func readUint64(fp *os.File)(uint64, error){ + buff := make([]byte, 8) + _, err := fp.Read(buff) + if err != nil { + return 0, err + } + return binary.BigEndian.Uint64(buff), nil +} + +func readString(fp *os.File, len int)(string, error){ + buff := make([]byte, len) + _, err := fp.Read(buff) + if err != nil { + return "", err + } + return string(buff), nil +} + +func readBytes(fp *os.File, len int)([]byte, error){ + buff := make([]byte, len) + _, err := fp.Read(buff) + if err != nil { + return []byte{}, err + } + return buff, nil +} + +func readFontSearchArgs(fp *os.File)([]uint16, error){ + ret := []uint16{} + arg1, err := readUint16(fp) + if err != nil { + return ret, err + } + ret = append(ret, arg1) + arg1, err = readUint16(fp) + if err != nil { + return ret, err + } + ret = append(ret, arg1) + arg1, err = readUint16(fp) + if err != nil { + return ret, err + } + ret = append(ret, arg1) + return ret, nil +} + +type ftable struct{ + Name string + Sum uint32 + Offset uint32 + Length uint32 +} + +func readFontTables(fp *os.File, tables uint16)([]ftable, error){ + ret := []ftable{} + for i := 0; i < int(tables); i++ { + t :=ftable{} + name, err := readString(fp, 4) + if err != nil { + return ret, err + } + t.Name = name + sum, err := readUint32(fp) + if err != nil { + return ret, err + } + t.Sum = sum + addr, err := readUint32(fp) + if err != nil { + return ret, err + } + t.Offset = addr + length, err := readUint32(fp) + if err != nil { + return ret, err + } + t.Length = length + ret = append(ret, t) + } + return ret, nil +} + +func readNameTable(fp *os.File, offset uint32, length uint32)([]byte, error){ + fp.Seek(int64(offset), 0) + return readBytes(fp, int(length)) +} + +func readFont(file string)error{ + fp, err := os.OpenFile(file, os.O_RDONLY, os.ModePerm) + if err != nil { + return err + } + defer fp.Close() + verB, err := readUint16(fp) + if err != nil { + return err + } + verL, err := readInt16(fp) + if err != nil { + return err + } + fmt.Println("font head version is", fmt.Sprintf("%d.%d", verB, verL)) + tableCount, err := readUint16(fp) + if err != nil { + return err + } + fmt.Println("font table count is", tableCount) + args, err := readFontSearchArgs(fp) + if err != nil { + return err + } + fmt.Println("font search args is", args) + tables, err := readFontTables(fp, tableCount) + if err != nil { + return err + } + nameBuff := []byte{} + for n, table := range tables { + fmt.Println("font table", n+1, ": name: ", table.Name, " sum: ", table.Sum, " offset: ", table.Offset, " length: ", table.Length) + if table.Name == "name" { + nameBuff, err = readNameTable(fp, table.Offset, table.Length) + } + } + if err != nil { + return err + } + fmt.Println("name table: ", string(nameBuff)) + return nil +} + +func main(){ + err := readFont("文鼎中黑.ttf") + if err != nil { + panic(err) + } +} \ No newline at end of file diff --git a/go/test.go b/go/test.go new file mode 100644 index 0000000..2e36fce --- /dev/null +++ b/go/test.go @@ -0,0 +1,31 @@ +package test + +type Cmd interface{ + Result()bool + Output()string +} + +type cmd struct{ + r bool + o string +} + +func (c *cmd)exec(s string, args ...string){ + //.... + // c.r = ... + //c.o = ... +} + +func (c *cmd)Result()bool{ + return c.r +} + +func (c *cmd)Output()string{ + return c.o +} + +func Exec(s string, args ...string)Cmd{ + c := &cmd{} + c.exec(s, args...) + return c +} diff --git a/kubernetes/custom_resources/readme.md b/kubernetes/custom_resources/readme.md index 7b3c0d7..7de2858 100644 --- a/kubernetes/custom_resources/readme.md +++ b/kubernetes/custom_resources/readme.md @@ -36,7 +36,7 @@ controller-gen crd --paths=/git/demo/api/... output:dir=/git/demo/crd 安装 ```bash -wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v3.4.1/kubebuilder_linux_amd64 -O ${HOME}/go/bin/kubebuilder +wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v3.13.0/kubebuilder_linux_amd64 -O ${HOME}/go/bin/kubebuilder chmod +x ${HOME}/go/bin/kubebuilder ``` @@ -74,7 +74,7 @@ kubebuilder create api --group project.demo.io --version v1 --kind Demo 安装 ```bash -go get sigs.k8s.io/kustomize/kustomize/v3 +go get sigs.k8s.io/kustomize/kustomize/v5.3.0 ``` 使用方法参见[官方指南](https://kubectl.docs.kubernetes.io/zh/guides) diff --git a/kubernetes/installation/scripts/get_images.sh b/kubernetes/installation/scripts/get_images.sh index 76fa414..bbad768 100644 --- a/kubernetes/installation/scripts/get_images.sh +++ b/kubernetes/installation/scripts/get_images.sh @@ -12,9 +12,7 @@ do ctr images push -k -u ${IMAGE_REGISTRY_USER} ${IMAGE_REGISTRY}/${IMAGE_NAME} # ctr images rm ${IMAGE} done -<<<<<<< Updated upstream #192.168.0.144:1080 ccr.ccs.tencentyun.com/kgcrio 100004225373 -======= #192.168.0.144:1080 ccr.ccs.tencentyun.com/kgcrio 100004225373:Hello2022 https_proxy=192.168.0.200:1080 ctr images pull --all-platforms registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.10.0 https_proxy=192.168.0.200:1080 ctr images pull --all-platforms registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.8.2 @@ -23,4 +21,3 @@ ctr images tag registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.9.2 regi registry-vpc.cn-hangzhou.aliyuncs.com/slmgoogle ->>>>>>> Stashed changes