Allow using multiple ttf files with separate styles of same family #220

Open

pulsejet wants to merge 1 commit from pulsejet/fontstyle into master

pulsejet commented

2019-05-12 10:38:11 +00:00

(Migrated from github.com)

This is done by keeping a BoostHash of all the styles we have and their corresponding paths, and passing the style when we want to get the font.

carstene1ns commented

2019-05-12 16:10:53 +00:00

(Migrated from github.com)

I really hoped we could be boost-free nowadays... 😞

I really hoped we could be boost-free nowadays... :disappointed:

pulsejet commented

2019-05-12 19:55:01 +00:00

(Migrated from github.com)

@carstene1ns BoostHash is not boost xD. I'm using it just for consistency. This actually would make it easier if we wanted to transition that class to C++11 (you can literally replace all instances of boost::unordered_map in boost-hash.h with std::map and it just works; do the same thing for unordered_set and you no longer need to compile boost).

@carstene1ns `BoostHash` is _not_ boost xD. I'm using it just for consistency. This actually would make it easier if we wanted to transition that class to C++11 (you can literally replace all instances of `boost::unordered_map` in `boost-hash.h` with `std::map` and it just works; do the same thing for `unordered_set` and you no longer need to compile boost).

👍 1

Ancurio commented

2019-05-13 08:57:42 +00:00

(Migrated from github.com)

Yeah, I wrote BoostHash just to mimic the API of QHash, its predecessor.

Ghabry commented

2019-07-03 17:51:56 +00:00

(Migrated from github.com)

@pulsejet well there is still boost::program_options which is not trivial to replace or do you have an alternative for this? :o

👀 1

This pull request can be merged automatically.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin pulsejet/fontstyle:pulsejet/fontstyle

git checkout pulsejet/fontstyle

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master

git merge --no-ff pulsejet/fontstyle

git checkout pulsejet/fontstyle

git rebase master

git checkout master

git merge --ff-only pulsejet/fontstyle

git checkout pulsejet/fontstyle

git rebase master

git checkout master

git merge --no-ff pulsejet/fontstyle

git checkout master

git merge --squash pulsejet/fontstyle