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

Still more TODO resolution.

This commit is contained in:
Pietro Gagliardi 2017-02-24 18:19:34 -05:00
parent cca4db5ce9
commit 28b30367e2
5 changed files with 81 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
_future/otherattributes/ui.h
View File

@ -155,26 +155,26 @@ _UI_ENUM(uiAttribute) {
// TODO "Alternate"? unify all this // TODO "Alternate"? unify all this
// TODO document that these are guaranteed to be consecutive // TODO document that these are guaranteed to be consecutive
uiAttributeStylisticAlternative1, // 0 = off, 1 = on uiAttributeStylisticAlternate1, // 0 = off, 1 = on
uiAttributeStylisticAlternative2, // 0 = off, 1 = on uiAttributeStylisticAlternate2, // 0 = off, 1 = on
uiAttributeStylisticAlternative3, // 0 = off, 1 = on uiAttributeStylisticAlternate3, // 0 = off, 1 = on
uiAttributeStylisticAlternative4, // 0 = off, 1 = on uiAttributeStylisticAlternate4, // 0 = off, 1 = on
uiAttributeStylisticAlternative5, // 0 = off, 1 = on uiAttributeStylisticAlternate5, // 0 = off, 1 = on
uiAttributeStylisticAlternative6, // 0 = off, 1 = on uiAttributeStylisticAlternate6, // 0 = off, 1 = on
uiAttributeStylisticAlternative7, // 0 = off, 1 = on uiAttributeStylisticAlternate7, // 0 = off, 1 = on
uiAttributeStylisticAlternative8, // 0 = off, 1 = on uiAttributeStylisticAlternate8, // 0 = off, 1 = on
uiAttributeStylisticAlternative9, // 0 = off, 1 = on uiAttributeStylisticAlternate9, // 0 = off, 1 = on
uiAttributeStylisticAlternative10, // 0 = off, 1 = on uiAttributeStylisticAlternate10, // 0 = off, 1 = on
uiAttributeStylisticAlternative11, // 0 = off, 1 = on uiAttributeStylisticAlternate11, // 0 = off, 1 = on
uiAttributeStylisticAlternative12, // 0 = off, 1 = on uiAttributeStylisticAlternate12, // 0 = off, 1 = on
uiAttributeStylisticAlternative13, // 0 = off, 1 = on uiAttributeStylisticAlternate13, // 0 = off, 1 = on
uiAttributeStylisticAlternative14, // 0 = off, 1 = on uiAttributeStylisticAlternate14, // 0 = off, 1 = on
uiAttributeStylisticAlternative15, // 0 = off, 1 = on uiAttributeStylisticAlternate15, // 0 = off, 1 = on
uiAttributeStylisticAlternative16, // 0 = off, 1 = on uiAttributeStylisticAlternate16, // 0 = off, 1 = on
uiAttributeStylisticAlternative17, // 0 = off, 1 = on uiAttributeStylisticAlternate17, // 0 = off, 1 = on
uiAttributeStylisticAlternative18, // 0 = off, 1 = on uiAttributeStylisticAlternate18, // 0 = off, 1 = on
uiAttributeStylisticAlternative19, // 0 = off, 1 = on uiAttributeStylisticAlternate19, // 0 = off, 1 = on
uiAttributeStylisticAlternative20, // 0 = off, 1 = on uiAttributeStylisticAlternate20, // 0 = off, 1 = on
uiAttributeContextualAlternates, // 0 = off, 1 = on uiAttributeContextualAlternates, // 0 = off, 1 = on
uiAttributeSwashes, // 0 = off, 1 = on uiAttributeSwashes, // 0 = off, 1 = on

40
common/opentype.c
View File

@ -165,64 +165,64 @@ void specToOpenType(uiAttributeSpec *spec, specToOpenTypeEnumFunc f, void *data)
case uiAttributeAlternateVerticalKana: case uiAttributeAlternateVerticalKana:
boolspec(spec, "vkna", f, data); boolspec(spec, "vkna", f, data);
return; return;
case uiAttributeStylisticAlternative1: case uiAttributeStylisticAlternate1:
boolspec(spec, "ss01", f, data); boolspec(spec, "ss01", f, data);
return; return;
case uiAttributeStylisticAlternative2: case uiAttributeStylisticAlternate2:
boolspec(spec, "ss02", f, data); boolspec(spec, "ss02", f, data);
return; return;
case uiAttributeStylisticAlternative3: case uiAttributeStylisticAlternate3:
boolspec(spec, "ss03", f, data); boolspec(spec, "ss03", f, data);
return; return;
case uiAttributeStylisticAlternative4: case uiAttributeStylisticAlternate4:
boolspec(spec, "ss04", f, data); boolspec(spec, "ss04", f, data);
return; return;
case uiAttributeStylisticAlternative5: case uiAttributeStylisticAlternate5:
boolspec(spec, "ss05", f, data); boolspec(spec, "ss05", f, data);
return; return;
case uiAttributeStylisticAlternative6: case uiAttributeStylisticAlternate6:
boolspec(spec, "ss06", f, data); boolspec(spec, "ss06", f, data);
return; return;
case uiAttributeStylisticAlternative7: case uiAttributeStylisticAlternate7:
boolspec(spec, "ss07", f, data); boolspec(spec, "ss07", f, data);
return; return;
case uiAttributeStylisticAlternative8: case uiAttributeStylisticAlternate8:
boolspec(spec, "ss08", f, data); boolspec(spec, "ss08", f, data);
return; return;
case uiAttributeStylisticAlternative9: case uiAttributeStylisticAlternate9:
boolspec(spec, "ss09", f, data); boolspec(spec, "ss09", f, data);
return; return;
case uiAttributeStylisticAlternative10: case uiAttributeStylisticAlternate10:
boolspec(spec, "ss10", f, data); boolspec(spec, "ss10", f, data);
return; return;
case uiAttributeStylisticAlternative11: case uiAttributeStylisticAlternate11:
boolspec(spec, "ss11", f, data); boolspec(spec, "ss11", f, data);
return; return;
case uiAttributeStylisticAlternative12: case uiAttributeStylisticAlternate12:
boolspec(spec, "ss12", f, data); boolspec(spec, "ss12", f, data);
return; return;
case uiAttributeStylisticAlternative13: case uiAttributeStylisticAlternate13:
boolspec(spec, "ss13", f, data); boolspec(spec, "ss13", f, data);
return; return;
case uiAttributeStylisticAlternative14: case uiAttributeStylisticAlternate14:
boolspec(spec, "ss14", f, data); boolspec(spec, "ss14", f, data);
return; return;
case uiAttributeStylisticAlternative15: case uiAttributeStylisticAlternate15:
boolspec(spec, "ss15", f, data); boolspec(spec, "ss15", f, data);
return; return;
case uiAttributeStylisticAlternative16: case uiAttributeStylisticAlternate16:
boolspec(spec, "ss16", f, data); boolspec(spec, "ss16", f, data);
return; return;
case uiAttributeStylisticAlternative17: case uiAttributeStylisticAlternate17:
boolspec(spec, "ss17", f, data); boolspec(spec, "ss17", f, data);
return; return;
case uiAttributeStylisticAlternative18: case uiAttributeStylisticAlternate18:
boolspec(spec, "ss18", f, data); boolspec(spec, "ss18", f, data);
return; return;
case uiAttributeStylisticAlternative19: case uiAttributeStylisticAlternate19:
boolspec(spec, "ss19", f, data); boolspec(spec, "ss19", f, data);
return; return;
case uiAttributeStylisticAlternative20: case uiAttributeStylisticAlternate20:
boolspec(spec, "ss20", f, data); boolspec(spec, "ss20", f, data);
return; return;
case uiAttributeContextualAlternates: case uiAttributeContextualAlternates:

40
darwin/aat.m
View File

@ -213,121 +213,121 @@ int specToAAT(uiAttributeSpec *spec, specToAATEnumFunc f, void *data)
kAlternateVertKanaOffSelector, kAlternateVertKanaOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative1: case uiAttributeStylisticAlternate1:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltOneOnSelector, kStylisticAltOneOnSelector,
kStylisticAltOneOffSelector, kStylisticAltOneOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative2: case uiAttributeStylisticAlternate2:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltTwoOnSelector, kStylisticAltTwoOnSelector,
kStylisticAltTwoOffSelector, kStylisticAltTwoOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative3: case uiAttributeStylisticAlternate3:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltThreeOnSelector, kStylisticAltThreeOnSelector,
kStylisticAltThreeOffSelector, kStylisticAltThreeOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative4: case uiAttributeStylisticAlternate4:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltFourOnSelector, kStylisticAltFourOnSelector,
kStylisticAltFourOffSelector, kStylisticAltFourOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative5: case uiAttributeStylisticAlternate5:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltFiveOnSelector, kStylisticAltFiveOnSelector,
kStylisticAltFiveOffSelector, kStylisticAltFiveOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative6: case uiAttributeStylisticAlternate6:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltSixOnSelector, kStylisticAltSixOnSelector,
kStylisticAltSixOffSelector, kStylisticAltSixOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative7: case uiAttributeStylisticAlternate7:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltSevenOnSelector, kStylisticAltSevenOnSelector,
kStylisticAltSevenOffSelector, kStylisticAltSevenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative8: case uiAttributeStylisticAlternate8:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltEightOnSelector, kStylisticAltEightOnSelector,
kStylisticAltEightOffSelector, kStylisticAltEightOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative9: case uiAttributeStylisticAlternate9:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltNineOnSelector, kStylisticAltNineOnSelector,
kStylisticAltNineOffSelector, kStylisticAltNineOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative10: case uiAttributeStylisticAlternate10:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltTenOnSelector, kStylisticAltTenOnSelector,
kStylisticAltTenOffSelector, kStylisticAltTenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative11: case uiAttributeStylisticAlternate11:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltElevenOnSelector, kStylisticAltElevenOnSelector,
kStylisticAltElevenOffSelector, kStylisticAltElevenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative12: case uiAttributeStylisticAlternate12:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltTwelveOnSelector, kStylisticAltTwelveOnSelector,
kStylisticAltTwelveOffSelector, kStylisticAltTwelveOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative13: case uiAttributeStylisticAlternate13:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltThirteenOnSelector, kStylisticAltThirteenOnSelector,
kStylisticAltThirteenOffSelector, kStylisticAltThirteenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative14: case uiAttributeStylisticAlternate14:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltFourteenOnSelector, kStylisticAltFourteenOnSelector,
kStylisticAltFourteenOffSelector, kStylisticAltFourteenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative15: case uiAttributeStylisticAlternate15:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltFifteenOnSelector, kStylisticAltFifteenOnSelector,
kStylisticAltFifteenOffSelector, kStylisticAltFifteenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative16: case uiAttributeStylisticAlternate16:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltSixteenOnSelector, kStylisticAltSixteenOnSelector,
kStylisticAltSixteenOffSelector, kStylisticAltSixteenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative17: case uiAttributeStylisticAlternate17:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltSeventeenOnSelector, kStylisticAltSeventeenOnSelector,
kStylisticAltSeventeenOffSelector, kStylisticAltSeventeenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative18: case uiAttributeStylisticAlternate18:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltEighteenOnSelector, kStylisticAltEighteenOnSelector,
kStylisticAltEighteenOffSelector, kStylisticAltEighteenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative19: case uiAttributeStylisticAlternate19:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltNineteenOnSelector, kStylisticAltNineteenOnSelector,
kStylisticAltNineteenOffSelector, kStylisticAltNineteenOffSelector,
f, data); f, data);
return 1; return 1;
case uiAttributeStylisticAlternative20: case uiAttributeStylisticAlternate20:
boolspec(spec, kStylisticAlternativesType, boolspec(spec, kStylisticAlternativesType,
kStylisticAltTwentyOnSelector, kStylisticAltTwentyOnSelector,
kStylisticAltTwentyOffSelector, kStylisticAltTwentyOffSelector,

2
examples/drawtext/attributes.c
View File

@ -616,7 +616,7 @@ static void setupAttributedString(void)
next = "g"; next = "g";
uiAttributedStringAppendUnattributed(attrstr, "stylistic alternates ("); uiAttributedStringAppendUnattributed(attrstr, "stylistic alternates (");
uiAttributedStringAppendUnattributed(attrstr, next); uiAttributedStringAppendUnattributed(attrstr, next);
spec.Type = uiAttributeStylisticAlternative1; spec.Type = uiAttributeStylisticAlternate1;
spec.Value = 1; spec.Value = 1;
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
start = uiAttributedStringLen(attrstr); start = uiAttributedStringLen(attrstr);

41
ui_attrstr.h
View File

@ -125,28 +125,27 @@ _UI_ENUM(uiAttribute) {
uiAttributeAlternateHorizontalKana, // 0 = off, 1 = on uiAttributeAlternateHorizontalKana, // 0 = off, 1 = on
uiAttributeAlternateVerticalKana, // 0 = off, 1 = on uiAttributeAlternateVerticalKana, // 0 = off, 1 = on
// TODO "Alternate"? unify all this
// TODO document that these are guaranteed to be consecutive // TODO document that these are guaranteed to be consecutive
uiAttributeStylisticAlternative1, // 0 = off, 1 = on uiAttributeStylisticAlternate1, // 0 = off, 1 = on
uiAttributeStylisticAlternative2, // 0 = off, 1 = on uiAttributeStylisticAlternate2, // 0 = off, 1 = on
uiAttributeStylisticAlternative3, // 0 = off, 1 = on uiAttributeStylisticAlternate3, // 0 = off, 1 = on
uiAttributeStylisticAlternative4, // 0 = off, 1 = on uiAttributeStylisticAlternate4, // 0 = off, 1 = on
uiAttributeStylisticAlternative5, // 0 = off, 1 = on uiAttributeStylisticAlternate5, // 0 = off, 1 = on
uiAttributeStylisticAlternative6, // 0 = off, 1 = on uiAttributeStylisticAlternate6, // 0 = off, 1 = on
uiAttributeStylisticAlternative7, // 0 = off, 1 = on uiAttributeStylisticAlternate7, // 0 = off, 1 = on
uiAttributeStylisticAlternative8, // 0 = off, 1 = on uiAttributeStylisticAlternate8, // 0 = off, 1 = on
uiAttributeStylisticAlternative9, // 0 = off, 1 = on uiAttributeStylisticAlternate9, // 0 = off, 1 = on
uiAttributeStylisticAlternative10, // 0 = off, 1 = on uiAttributeStylisticAlternate10, // 0 = off, 1 = on
uiAttributeStylisticAlternative11, // 0 = off, 1 = on uiAttributeStylisticAlternate11, // 0 = off, 1 = on
uiAttributeStylisticAlternative12, // 0 = off, 1 = on uiAttributeStylisticAlternate12, // 0 = off, 1 = on
uiAttributeStylisticAlternative13, // 0 = off, 1 = on uiAttributeStylisticAlternate13, // 0 = off, 1 = on
uiAttributeStylisticAlternative14, // 0 = off, 1 = on uiAttributeStylisticAlternate14, // 0 = off, 1 = on
uiAttributeStylisticAlternative15, // 0 = off, 1 = on uiAttributeStylisticAlternate15, // 0 = off, 1 = on
uiAttributeStylisticAlternative16, // 0 = off, 1 = on uiAttributeStylisticAlternate16, // 0 = off, 1 = on
uiAttributeStylisticAlternative17, // 0 = off, 1 = on uiAttributeStylisticAlternate17, // 0 = off, 1 = on
uiAttributeStylisticAlternative18, // 0 = off, 1 = on uiAttributeStylisticAlternate18, // 0 = off, 1 = on
uiAttributeStylisticAlternative19, // 0 = off, 1 = on uiAttributeStylisticAlternate19, // 0 = off, 1 = on
uiAttributeStylisticAlternative20, // 0 = off, 1 = on uiAttributeStylisticAlternate20, // 0 = off, 1 = on
uiAttributeContextualAlternates, // 0 = off, 1 = on uiAttributeContextualAlternates, // 0 = off, 1 = on
uiAttributeSwashes, // 0 = off, 1 = on uiAttributeSwashes, // 0 = off, 1 = on