interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More TODO resolution and pointless TODO elimination.

This commit is contained in:
Pietro Gagliardi 2017-02-24 18:15:20 -05:00
parent f6e9da916a
commit cca4db5ce9
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_future/otherattributes/ui.h
View File

@ -129,7 +129,7 @@ _UI_ENUM(uiAttribute) {
// 9 = inverted box
// 10 = inverted rounded box
// TODO rename to AnnotatedForms?
uiAttributeGlyphAnnotations, // an integer from 0 to a font-specified upper bound
uiAttributeAnnotatedGlyphForms, // an integer from 0 to a font-specified upper bound
// TODO provide a function to get the upper bound?
// TODO kKanaSpacingType

2
common/opentype.c
View File

@ -144,7 +144,7 @@ void specToOpenType(uiAttributeSpec *spec, specToOpenTypeEnumFunc f, void *data)
case uiAttributeHanjaToHangul:
boolspec(spec, "hngl", f, data);
return;
case uiAttributeGlyphAnnotations:
case uiAttributeAnnotatedGlyphForms:
(*f)("nalt", (uint32_t) (spec->Value), data);
return;
case uiAttributeRubyKanaForms:

2
darwin/aat.m
View File

@ -162,7 +162,7 @@ int specToAAT(uiAttributeSpec *spec, specToAATEnumFunc f, void *data)
if (spec->Value != 0)
(*f)(kTransliterationType, kHanjaToHangulSelector, data);
return 1;
case uiAttributeGlyphAnnotations:
case uiAttributeAnnotatedGlyphForms:
(*f)(kAnnotationType, (uint16_t) (spec->Value), data);
return 1;
case uiAttributeRubyKanaForms:

6
examples/drawtext/attributes.c
View File

@ -483,21 +483,21 @@ static void setupAttributedString(void)
start = uiAttributedStringLen(attrstr);
end = start + strlen(next);
uiAttributedStringAppendUnattributed(attrstr, next);
spec.Type = uiAttributeGlyphAnnotations;
spec.Type = uiAttributeAnnotatedGlyphForms;
spec.Value = 0;
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
uiAttributedStringAppendUnattributed(attrstr, " vs. ");
start = uiAttributedStringLen(attrstr);
end = start + strlen(next);
uiAttributedStringAppendUnattributed(attrstr, next);
spec.Type = uiAttributeGlyphAnnotations;
spec.Type = uiAttributeAnnotatedGlyphForms;
spec.Value = 1;
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
uiAttributedStringAppendUnattributed(attrstr, " vs. ");
start = uiAttributedStringLen(attrstr);
end = start + strlen(next);
uiAttributedStringAppendUnattributed(attrstr, next);
spec.Type = uiAttributeGlyphAnnotations;
spec.Type = uiAttributeAnnotatedGlyphForms;
spec.Value = 4; // AAT inverted circle
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
uiAttributedStringAppendUnattributed(attrstr, ")");

6
ui_attrstr.h
View File

@ -29,7 +29,7 @@ _UI_ENUM(uiAttribute) {
uiAttributeBackground, // use R, G, B, A
uiAttributeUnderline, // enum uiDrawUnderlineStyle
// TODO ensure the color in the case we don't specify it is the text color?
// TODO document that the color in the case we don't specify it is the text color
uiAttributeUnderlineColor, // enum uiDrawUnderlineColor
// These attributes represent typographic features. Each feature
@ -85,7 +85,6 @@ _UI_ENUM(uiAttribute) {
// following values:
// 0 = none
// OpenType calls this "access all alternates".
// TODO doesn't OpenType do the same about 0?
uiAttributeSpecificCharacterForm, // an integer from 0 to a font-specified upper bound
// TODO provide a function to get the upper bound?
@ -111,8 +110,7 @@ _UI_ENUM(uiAttribute) {
// 8 = diamond
// 9 = inverted box
// 10 = inverted rounded box
// TODO rename to AnnotatedForms?
uiAttributeGlyphAnnotations, // an integer from 0 to a font-specified upper bound
uiAttributeAnnotatedGlyphForms, // an integer from 0 to a font-specified upper bound
// TODO provide a function to get the upper bound?
uiAttributeRubyKanaForms, // 0 = off, 1 = on