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 document that these are guaranteed to be consecutive
uiAttributeStylisticAlternative1, // 0 = off, 1 = on
uiAttributeStylisticAlternative2, // 0 = off, 1 = on
uiAttributeStylisticAlternative3, // 0 = off, 1 = on
uiAttributeStylisticAlternative4, // 0 = off, 1 = on
uiAttributeStylisticAlternative5, // 0 = off, 1 = on
uiAttributeStylisticAlternative6, // 0 = off, 1 = on
uiAttributeStylisticAlternative7, // 0 = off, 1 = on
uiAttributeStylisticAlternative8, // 0 = off, 1 = on
uiAttributeStylisticAlternative9, // 0 = off, 1 = on
uiAttributeStylisticAlternative10, // 0 = off, 1 = on
uiAttributeStylisticAlternative11, // 0 = off, 1 = on
uiAttributeStylisticAlternative12, // 0 = off, 1 = on
uiAttributeStylisticAlternative13, // 0 = off, 1 = on
uiAttributeStylisticAlternative14, // 0 = off, 1 = on
uiAttributeStylisticAlternative15, // 0 = off, 1 = on
uiAttributeStylisticAlternative16, // 0 = off, 1 = on
uiAttributeStylisticAlternative17, // 0 = off, 1 = on
uiAttributeStylisticAlternative18, // 0 = off, 1 = on
uiAttributeStylisticAlternative19, // 0 = off, 1 = on
uiAttributeStylisticAlternative20, // 0 = off, 1 = on
uiAttributeStylisticAlternate1, // 0 = off, 1 = on
uiAttributeStylisticAlternate2, // 0 = off, 1 = on
uiAttributeStylisticAlternate3, // 0 = off, 1 = on
uiAttributeStylisticAlternate4, // 0 = off, 1 = on
uiAttributeStylisticAlternate5, // 0 = off, 1 = on
uiAttributeStylisticAlternate6, // 0 = off, 1 = on
uiAttributeStylisticAlternate7, // 0 = off, 1 = on
uiAttributeStylisticAlternate8, // 0 = off, 1 = on
uiAttributeStylisticAlternate9, // 0 = off, 1 = on
uiAttributeStylisticAlternate10, // 0 = off, 1 = on
uiAttributeStylisticAlternate11, // 0 = off, 1 = on
uiAttributeStylisticAlternate12, // 0 = off, 1 = on
uiAttributeStylisticAlternate13, // 0 = off, 1 = on
uiAttributeStylisticAlternate14, // 0 = off, 1 = on
uiAttributeStylisticAlternate15, // 0 = off, 1 = on
uiAttributeStylisticAlternate16, // 0 = off, 1 = on
uiAttributeStylisticAlternate17, // 0 = off, 1 = on
uiAttributeStylisticAlternate18, // 0 = off, 1 = on
uiAttributeStylisticAlternate19, // 0 = off, 1 = on
uiAttributeStylisticAlternate20, // 0 = off, 1 = on
uiAttributeContextualAlternates, // 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:
boolspec(spec, "vkna", f, data);
return;
case uiAttributeStylisticAlternative1:
case uiAttributeStylisticAlternate1:
boolspec(spec, "ss01", f, data);
return;
case uiAttributeStylisticAlternative2:
case uiAttributeStylisticAlternate2:
boolspec(spec, "ss02", f, data);
return;
case uiAttributeStylisticAlternative3:
case uiAttributeStylisticAlternate3:
boolspec(spec, "ss03", f, data);
return;
case uiAttributeStylisticAlternative4:
case uiAttributeStylisticAlternate4:
boolspec(spec, "ss04", f, data);
return;
case uiAttributeStylisticAlternative5:
case uiAttributeStylisticAlternate5:
boolspec(spec, "ss05", f, data);
return;
case uiAttributeStylisticAlternative6:
case uiAttributeStylisticAlternate6:
boolspec(spec, "ss06", f, data);
return;
case uiAttributeStylisticAlternative7:
case uiAttributeStylisticAlternate7:
boolspec(spec, "ss07", f, data);
return;
case uiAttributeStylisticAlternative8:
case uiAttributeStylisticAlternate8:
boolspec(spec, "ss08", f, data);
return;
case uiAttributeStylisticAlternative9:
case uiAttributeStylisticAlternate9:
boolspec(spec, "ss09", f, data);
return;
case uiAttributeStylisticAlternative10:
case uiAttributeStylisticAlternate10:
boolspec(spec, "ss10", f, data);
return;
case uiAttributeStylisticAlternative11:
case uiAttributeStylisticAlternate11:
boolspec(spec, "ss11", f, data);
return;
case uiAttributeStylisticAlternative12:
case uiAttributeStylisticAlternate12:
boolspec(spec, "ss12", f, data);
return;
case uiAttributeStylisticAlternative13:
case uiAttributeStylisticAlternate13:
boolspec(spec, "ss13", f, data);
return;
case uiAttributeStylisticAlternative14:
case uiAttributeStylisticAlternate14:
boolspec(spec, "ss14", f, data);
return;
case uiAttributeStylisticAlternative15:
case uiAttributeStylisticAlternate15:
boolspec(spec, "ss15", f, data);
return;
case uiAttributeStylisticAlternative16:
case uiAttributeStylisticAlternate16:
boolspec(spec, "ss16", f, data);
return;
case uiAttributeStylisticAlternative17:
case uiAttributeStylisticAlternate17:
boolspec(spec, "ss17", f, data);
return;
case uiAttributeStylisticAlternative18:
case uiAttributeStylisticAlternate18:
boolspec(spec, "ss18", f, data);
return;
case uiAttributeStylisticAlternative19:
case uiAttributeStylisticAlternate19:
boolspec(spec, "ss19", f, data);
return;
case uiAttributeStylisticAlternative20:
case uiAttributeStylisticAlternate20:
boolspec(spec, "ss20", f, data);
return;
case uiAttributeContextualAlternates:

40
darwin/aat.m
View File

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

2
examples/drawtext/attributes.c
View File

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

41
ui_attrstr.h
View File

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