Add getters for a font's name, style #19
Conversation
| @@ -95,11 +99,16 @@ type cm struct { | |||
| start, end, delta, offset uint32 | |||
| } | |||
|
|
|||
| // An nr holds a font's name, style | |||
There was a problem hiding this comment.
Doc comments should be complete sentences. Add a full stop.
|
The code has been updated. Comments added. I haven't changed the eager reading yet. |
| } | ||
|
|
||
| const ( // The platform IDs in the name table. | ||
| PLATFORM_UNICODE = 0 |
There was a problem hiding this comment.
Go names lookLikeThis, NOT_LIKE_THAT, even for constant names.
But it seems like you should be able to re-factor the constants like microsoftSymbolEncoding that are defined in parseCmap.
BTW it looks weird how you say that MICROSOFT_SYMBOL_CS has the value 1, but in parseCmap it says 0.
There was a problem hiding this comment.
To clarify the refactoring constants comment, do you mean move them to the global scope?
Thank you for the heads up on camelCasing constants in Go--and for catching the typo in MICROSOFT_SYMBOL_CS.
There was a problem hiding this comment.
Yes, move them to global scope.
I don't understand what you mean by a typo, though. Is the value 1 or 0?
|
Constants aren't camelCase yet.
These'll be resolved later. |
|
Just read |
| type NameID uint16 | ||
|
|
||
| const ( | ||
| NameIDCopyright NameID = iota |
There was a problem hiding this comment.
I'd rather be explicit:
NameIDCopyright NameID = 0
NameIDFontFamily NameID = 1
etc
as the values are fixed in the file format, and I don't want adding or deleting constants here to change their values.
Below, delete NameIDReserved.
Also includes decodeUTF16 func, which is used by parseName.
| } | ||
|
|
||
| // parseSubtables wraps the commonality in Name and parseCmap. | ||
| func parseSubtables(b []byte, name string, firstSubtableOffset, subtableSize, valueOffset, valueLengthOffset int, offsets, values []int, isU16Offset bool) (int, int, int, error) { |
| // Returns "" on error or not found. | ||
| func (f *Font) Name(id NameIDCode) string { | ||
| x, platformID, err := parseSubtables(f.name, "name", 6, 12, | ||
| func(b []byte) bool { |
There was a problem hiding this comment.
Move this to the previous line:
x, platformID, err := parseSubtables(f.name, "name", 6, 12, func(b []byte) bool {
return NameIDCode(u16(b, 6)) == id
})
| @@ -78,6 +113,88 @@ func readTable(ttf []byte, offsetLength []byte) ([]byte, error) { | |||
| return ttf[offset:end], nil | |||
| } | |||
|
|
|||
| // nameEntryInASCII converts b, which may be UTF-16 encoded, into an ACSII string. | |||
| func nameEntryInASCII(b []byte, utf16 bool) string { | |||
|
Updated. |
|
This has been merged. Thanks for your patience. |
|
You are very welcome. Thank you for working with me on this. In CONTRIBUTORS, could you update my name and change my email to steven@stephenwithav.com? |
|
The only entry I can find in our Contributor License Agreement database (http://golang.org/doc/contribute.html#tmp_6) is for cureadvocate@gmail.com If you want your CONTRIBUTORS entry to be under a different e-mail address, then I believe that you will have to sign the CLA again. |
|
Is there a way to add an alternate email address to the CLA? |
|
I'm told: "He might be able to remove his GitHub username from his current CLA (Sign in with that email at https://cla.developers.google.com/clas) and then add his username to another CLA he signs with his new email." |
|
Signed up for a new Google Account and submitted a new CLA. I didn't see an obvious way to delete the agreement from the current account, but I'll look into it more later. |
|
I've updated the AUTHORS and CONTRIBUTORS files. |
This PR aims to address #10 by adding
NameandStylefuncs to the publicFontAPI.NameandStyleare retrieved from the first nameRecord that includes both.The
luxisrfont is the only test case I added because I don't have the optional fonts referenced inTestIndex.The tests passed when ran against a handful of those available in
ttf-mscorefonts-installer.The UTF-16 string check on line 346 is a hack. If you know of a better option, I'll happily update it. :)