TennesseeTrash/kanjivg-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: TennesseeTrash:f15db30fb9b15fc1e2ec0f096e9339df223bbcae
Branches Tags
TennesseeTrash:master
TennesseeTrash:v0.2.4
TennesseeTrash:v0.2.3
TennesseeTrash:v0.2.2
TennesseeTrash:v0.2.1
TennesseeTrash:v0.2.0
TennesseeTrash:v0.1.2
TennesseeTrash:v0.1.1
TennesseeTrash:v0.1.0
TennesseeTrash:v0.0.1
..
compare: TennesseeTrash:a0b221f103d22768e939cd6c8b58fc084902eb01
Branches Tags
TennesseeTrash:master
TennesseeTrash:v0.2.4
TennesseeTrash:v0.2.3
TennesseeTrash:v0.2.2
TennesseeTrash:v0.2.1
TennesseeTrash:v0.2.0
TennesseeTrash:v0.1.2
TennesseeTrash:v0.1.1
TennesseeTrash:v0.1.0
TennesseeTrash:v0.0.1

No commits in common. "f15db30fb9b15fc1e2ec0f096e9339df223bbcae" and "a0b221f103d22768e939cd6c8b58fc084902eb01" have entirely different histories.
f15db30fb9 ... a0b221f103

5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMake/pugixml.cmake
View file

@ -1,4 +1,4 @@
if(NOT TARGET pugixml::static) if(NOT TARGET pugixml-static)
include(FetchContent) include(FetchContent)
FetchContent_Declare( FetchContent_Declare(

2
Libraries/Kanimaji/CMakeLists.txt
View file

@ -12,7 +12,7 @@ target_link_libraries(Kanimaji
KVGToolsCommon KVGToolsCommon
PRIVATE PRIVATE
pugixml::static pugixml-static
) )
target_include_directories(Kanimaji target_include_directories(Kanimaji

2
Libraries/Tablegen/CMakeLists.txt
View file

@ -17,7 +17,7 @@ target_link_libraries(Tablegen
KVGToolsCommon KVGToolsCommon
PRIVATE PRIVATE
pugixml::static pugixml-static
) )
target_sources(Tablegen target_sources(Tablegen

9
Libraries/Tablegen/Include/Tablegen/Tablegen.hpp
View file

@ -12,18 +12,17 @@
namespace Tablegen namespace Tablegen
{ {
std::string GeneratePage(const std::vector<CharacterInfo>& characters, std::string GeneratePage(std::vector<CharacterInfo> characters,
const Settings& settings = Settings::Default()); const Settings& settings = Settings::Default());
void GeneratePage(const std::string& path, const std::vector<CharacterInfo>& characters, void GeneratePage(const std::string& path, std::vector<CharacterInfo> characters,
const Settings& settings = Settings::Default()); const Settings& settings = Settings::Default());
# ifdef TABLEGEN_EXPOSE_XML # ifdef TABLEGEN_EXPOSE_XML
void GenerateAsChild(pugi::xml_node& node, const std::vector<CharacterInfo>& characters, void GenerateAsChild(pugi::xml_node& node, std::vector<CharacterInfo> characters,
const Settings& settings = Settings::Default()); const Settings& settings = Settings::Default());
pugi::xml_document GenerateDocument(const std::vector<CharacterInfo>& characters, pugi::xml_document GenerateDocument(std::vector<CharacterInfo> characters, const Settings& settings = Settings::Default());
const Settings& settings = Settings::Default());
# endif # endif
} }

8
Libraries/Tablegen/Source/Tablegen.cpp
View file

@ -95,7 +95,7 @@ namespace Tablegen
} }
} }
std::string GeneratePage(const std::vector<CharacterInfo>& characters, const Settings& settings) std::string GeneratePage(std::vector<CharacterInfo> characters, const Settings& settings)
{ {
pugi::xml_document doc = GenerateDocument(characters, settings); pugi::xml_document doc = GenerateDocument(characters, settings);
@ -106,7 +106,7 @@ namespace Tablegen
return str.str(); return str.str();
} }
void GeneratePage(const std::string& path, const std::vector<CharacterInfo>& characters, void GeneratePage(const std::string& path, std::vector<CharacterInfo> characters,
const Settings& settings) const Settings& settings)
{ {
pugi::xml_document doc = GenerateDocument(characters, settings); pugi::xml_document doc = GenerateDocument(characters, settings);
@ -116,7 +116,7 @@ namespace Tablegen
doc.save_file("test.html", " ", formatOptions); doc.save_file("test.html", " ", formatOptions);
} }
void GenerateAsChild(pugi::xml_node& node, const std::vector<CharacterInfo>& characters, void GenerateAsChild(pugi::xml_node& node, std::vector<CharacterInfo> characters,
const Settings& settings) const Settings& settings)
{ {
pugi::xml_node tableRoot = node; pugi::xml_node tableRoot = node;
@ -203,7 +203,7 @@ namespace Tablegen
script.append_child(pugi::node_pcdata).set_value(Script(indent, tagIndent, buttons)); script.append_child(pugi::node_pcdata).set_value(Script(indent, tagIndent, buttons));
} }
pugi::xml_document GenerateDocument(const std::vector<CharacterInfo>& characters, pugi::xml_document GenerateDocument(std::vector<CharacterInfo> characters,
const Settings& settings) const Settings& settings)
{ {
pugi::xml_document doc; pugi::xml_document doc;