[tx] Replace UFO content.plist/glyphList parsing with libxml2 #1543
Conversation
| GLIF_Rec* glifRec; | ||
|
|
||
| glifRec = &h->data.glifRecs.array[index]; | ||
|
|
||
| fileName = getKeyValue(h, "</string>", state); | ||
| if (fileName == NULL) { | ||
| fatal(h, ufoErrParse, "Encountered glyph reference in alternate layer's contents.plist with an empty file path. Text: '%s'.", getBufferContextPtr(h)); |
There was a problem hiding this comment.
Not sure why it didn't highlight line 1280-1281, but that is what I meant to highlight here.
Curious to hear your thoughts about this — a key with an empty file path as its value will not fail anymore because the new libxml2 parsing code will simply skip a key that has a missing or NULL value, rather than fail like it did in the older parser code.
I think this is fine but wanted to hear if you have concerns about it. I didn't think of adding warnings since we're trying to reduce the amount of warning messages we have, but I can add them in this case if needed.
c/shared/include/uforead.h
Outdated
| @@ -126,6 +126,10 @@ void ufoFree(ufoCtx h); | |||
| /* ufoFree() destroys the library context and all the resources allocated to | |||
| it. The temporary and debug data streams are closed. */ | |||
|
|
|||
| static void addGLIFRec(ufoCtx h, char* keyName, char* keyValue); | |||
There was a problem hiding this comment.
Since these are static they should be forward declarations in the .c file, not in the .h file.
There was a problem hiding this comment.
@skef thanks! I moved all the static functions to the c file, good to know!
kaydeearts
force-pushed
the
kd-libxml2-contentsplist
branch
from
0f7a6b9
to
54e446d
Compare
If there's anything I could clarify for you, let me know! |
Description
This PR replaces contents.plist (glyphList) parsing code with libxml2 #1521 as part of the tx parser replacement with libxml2 project
I added a comment below on your thoughts on something.
Checklist: