Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow specifying scale_factor #29

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Allow specifying scale_factor #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece2f4a
Improve CLI help
cboone Dec 16, 2023
0ccfe9b
Allow specifying scale_factor
cboone Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ string do_range(std::vector<FT_Face> &faces, std::string name, unsigned start, u
protozero::pbf_writer fontstack{fontstack_data};

fontstack.add_string(1,name);
fontstack.add_string(2,to_string(start) + "-" + to_string(end));
fontstack.add_string(2,to_string(start) + "-" + to_string(end));

for (unsigned x = start; x <= end; x++) {
FT_ULong char_code = x;
Expand Down Expand Up @@ -122,7 +122,7 @@ extern "C" {
return f;
}

void fontstack_add_face(fontstack *f, FT_Byte *base, FT_Long data_size) {
void fontstack_add_face(fontstack *f, FT_Byte *base, FT_Long data_size, double scale_factor = 1.0) {
FT_Face face = 0;
FT_Error face_error = FT_New_Memory_Face(f->library, base, data_size, 0, &face);
if (face_error) {
Expand All @@ -134,7 +134,6 @@ extern "C" {
if (!face->family_name) {
throw runtime_error("face does not have family name");
}
const double scale_factor = 1.0;
double size = 24 * scale_factor;
FT_Set_Char_Size(face, 0, static_cast<FT_F26Dot6>(size * (1 << 6)), 0, 0);
f->faces->push_back(face);
Expand Down Expand Up @@ -203,20 +202,29 @@ extern "C" {
#ifndef EMSCRIPTEN
int main(int argc, char *argv[])
{
cxxopts::Options cmd_options("font-maker", "Create font PBFs.");
cxxopts::Options cmd_options("font-maker", "Create font PBFs from TTFs or OTFs.");
cmd_options.add_options()
("output", "Output directory", cxxopts::value<string>())
("fonts", "Input fonts TTF or OTF", cxxopts::value<vector<string>>())
("output", "Output directory (to be created, must not already exist)", cxxopts::value<string>())
("fonts", "Input font(s) (as TTF or OTF)", cxxopts::value<vector<string>>())
("name", "Override output fontstack name", cxxopts::value<string>())
("scale-factor", "Override scale factor", cxxopts::value<double>()->default_value("1.0"))
("help", "Print usage")
;
cmd_options.positional_help("<OUTPUT_DIR> <INPUT_FONT> [INPUT_FONT2 ...]");
cmd_options.parse_positional({"output","fonts"});
auto result = cmd_options.parse(argc, argv);
if (result.count("help"))
{
cout << cmd_options.help() << endl;
exit(0);
}
if (result.count("output") == 0 || result.count("fonts") == 0) {
cout << "usage: font-maker OUTPUT_DIR INPUT_FONT [INPUT_FONT2 ...]" << endl;
cout << cmd_options.help() << endl;
exit(1);
}
auto output_dir = result["output"].as<string>();
auto fonts = result["fonts"].as<vector<string>>();
auto scale_factor = result["scale-factor"].as<double>();

if (ghc::filesystem::exists(output_dir)) {
cout << "ERROR: output directory " << output_dir << " exists." << endl;
Expand All @@ -236,7 +244,7 @@ int main(int argc, char *argv[])
f->data->push_back(buffer);
file.read(buffer, size);
std::cout << "Adding " << font << std::endl;
fontstack_add_face(f,(FT_Byte *)buffer,size);
fontstack_add_face(f,(FT_Byte *)buffer,size,scale_factor);
}

std::string fname{fontstack_name(f)};
Expand Down
Loading