First Commit
This commit is contained in:
commit
ae0fab9400
424 files changed
+71006
No files matched your search
@@ -0,0 +1 @@
|
||||
Removed because proper support on OS X doesn't come until 10.9 unless we use a font with an ltag table; none of the fonts I have come with ltag tables (none of the fonts on OS X do, or at least don't come with a sr entry in their ltag table, and OpenType has replaced ltag with what appears to be custom sub-tables of the GPOS and GSUB tables.)
|
||||
@@ -0,0 +1,19 @@
|
||||
struct fontParams {
|
||||
uiDrawFontDescriptor desc;
|
||||
uint16_t featureTypes[maxFeatures];
|
||||
uint16_t featureSelectors[maxFeatures];
|
||||
size_t nFeatures;
|
||||
const char *language;
|
||||
};
|
||||
|
||||
|
||||
// locale identifiers are specified as BCP 47: https://developer.apple.com/reference/corefoundation/cflocale?language=objc
|
||||
case uiAttributeLanguage:
|
||||
// LONGTERM FUTURE when we move to 10.9, switch to using kCTLanguageAttributeName
|
||||
ensureFontInRange(p, start, end);
|
||||
adjustFontInRange(p, start, end, ^(struct fontParams *fp) {
|
||||
fp->language = (const char *) (spec->Value);
|
||||
});
|
||||
break;
|
||||
|
||||
desc = fontdescAppendFeatures(desc, fp->featureTypes, fp->featureSelectors, fp->nFeatures, fp->language);
|
||||
@@ -0,0 +1,9 @@
|
||||
PangoLanguage *lang;
|
||||
|
||||
// language strings are specified as BCP 47: https://developer.gnome.org/pango/1.30/pango-Scripts-and-Languages.html#pango-language-from-string https://www.ietf.org/rfc/rfc3066.txt
|
||||
case uiAttributeLanguage:
|
||||
lang = pango_language_from_string((const char *) (spec->Value));
|
||||
addattr(p, start, end,
|
||||
pango_attr_language_new(lang));
|
||||
// lang *cannot* be freed
|
||||
break;
|
||||
@@ -0,0 +1,10 @@
|
||||
WCHAR *localeName;
|
||||
|
||||
// locale names are specified as BCP 47: https://msdn.microsoft.com/en-us/library/windows/desktop/dd373814(v=vs.85).aspx https://www.ietf.org/rfc/rfc4646.txt
|
||||
case uiAttributeLanguage:
|
||||
localeName = toUTF16((char *) (spec->Value));
|
||||
hr = p->layout->SetLocaleName(localeName, range);
|
||||
if (hr != S_OK)
|
||||
logHRESULT(L"error applying locale name attribute", hr);
|
||||
uiFree(localeName);
|
||||
break;
|
||||
@@ -0,0 +1,2 @@
|
||||
case uiAttributeLanguage:
|
||||
return asciiStringsEqualCaseFold((char *) (attr->spec.Value), (char *) (spec->Value));
|
||||
@@ -0,0 +1,27 @@
|
||||
before "or any combination of the above"
|
||||
|
||||
// thanks to https://twitter.com/codeman38/status/831924064012886017
|
||||
next = "\xD0\xB1\xD0\xB3\xD0\xB4\xD0\xBF\xD1\x82";
|
||||
uiAttributedStringAppendUnattributed(attrstr, "multiple languages (compare ");
|
||||
start = uiAttributedStringLen(attrstr);
|
||||
end = start + strlen(next);
|
||||
uiAttributedStringAppendUnattributed(attrstr, next);
|
||||
spec.Type = uiAttributeItalic;
|
||||
spec.Value = uiDrawTextItalicItalic;
|
||||
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
|
||||
spec.Type = uiAttributeLanguage;
|
||||
spec.Value = (uintptr_t) "ru";
|
||||
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
|
||||
uiAttributedStringAppendUnattributed(attrstr, " to ");
|
||||
start = uiAttributedStringLen(attrstr);
|
||||
end = start + strlen(next);
|
||||
uiAttributedStringAppendUnattributed(attrstr, next);
|
||||
spec.Type = uiAttributeItalic;
|
||||
spec.Value = uiDrawTextItalicItalic;
|
||||
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
|
||||
spec.Type = uiAttributeLanguage;
|
||||
spec.Value = (uintptr_t) "sr";
|
||||
uiAttributedStringSetAttribute(attrstr, &spec, start, end);
|
||||
uiAttributedStringAppendUnattributed(attrstr, " \xE2\x80\x94 may require changing the font)");
|
||||
|
||||
uiAttributedStringAppendUnattributed(attrstr, ", ");
|
||||
@@ -0,0 +1,112 @@
|
||||
// note: this doesn't work for languages; we have to parse the ltag table
|
||||
|
||||
// fortunately features that aren't supported are simply ignored, so we can copy them all in
|
||||
// LONGTERM FUTURE when we switch to 10.9, the language parameter won't be needed anymore
|
||||
// LONGTERM FUTURE and on 10.10 we can use OpenType tags directly!
|
||||
CTFontDescriptorRef fontdescAppendFeatures(CTFontDescriptorRef desc, const uint16_t *types, const uint16_t *selectors, size_t n, const char *language)
|
||||
{
|
||||
CTFontDescriptorRef new;
|
||||
CFMutableArrayRef outerArray;
|
||||
CFDictionaryRef innerDict;
|
||||
CFNumberRef numType, numSelector;
|
||||
const void *keys[2], *values[2];
|
||||
size_t i;
|
||||
CFArrayRef languages;
|
||||
CFIndex il, nl;
|
||||
CFStringRef curlang;
|
||||
char d[2];
|
||||
|
||||
outerArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
|
||||
if (outerArray == NULL) {
|
||||
// TODO
|
||||
}
|
||||
keys[0] = kCTFontFeatureTypeIdentifierKey;
|
||||
keys[1] = kCTFontFeatureSelectorIdentifierKey;
|
||||
for (i = 0; i < n; i++) {
|
||||
numType = CFNumberCreate(NULL, kCFNumberSInt16Type,
|
||||
(const SInt16 *) (types + i));
|
||||
numSelector = CFNumberCreate(NULL, kCFNumberSInt16Type,
|
||||
(const SInt16 *) (selectors + i));
|
||||
values[0] = numType;
|
||||
values[1] = numSelector;
|
||||
innerDict = CFDictionaryCreate(NULL,
|
||||
keys, values, 2,
|
||||
// TODO are these correct?
|
||||
&kCFCopyStringDictionaryKeyCallBacks,
|
||||
&kCFTypeDictionaryValueCallBacks);
|
||||
if (innerDict == NULL) {
|
||||
// TODO
|
||||
}
|
||||
CFArrayAppendValue(outerArray, innerDict);
|
||||
CFRelease(innerDict);
|
||||
CFRelease(numSelector);
|
||||
CFRelease(numType);
|
||||
}
|
||||
|
||||
// now we have to take care of the language
|
||||
if (language != NULL) {
|
||||
languages = CTFontDescriptorCopyAttribute(desc, kCTFontLanguagesAttribute);
|
||||
if (languages != NULL) {
|
||||
nl = CFArrayGetCount(languages);
|
||||
d[0] = language[0];
|
||||
if (d[0] >= 'A' && d[0] <= 'Z')
|
||||
d[0] += 'a' - 'A';
|
||||
d[1] = language[1];
|
||||
if (d[1] >= 'A' && d[1] <= 'Z')
|
||||
d[1] += 'a' - 'A';
|
||||
for (il = 0; il < nl; il++) {
|
||||
char c[2];
|
||||
|
||||
curlang = (CFStringRef) CFArrayGetValueAtIndex(languages, il);
|
||||
// TODO check for failure
|
||||
CFStringGetBytes(curlang, CFRangeMake(0, 2),
|
||||
kCFStringEncodingUTF8, 0, false,
|
||||
(UInt8 *) c, 2, NULL);
|
||||
if (c[0] >= 'A' && c[0] <= 'Z')
|
||||
c[0] += 'a' - 'A';
|
||||
if (c[1] >= 'A' && c[1] <= 'Z')
|
||||
c[1] += 'a' - 'A';
|
||||
if (c[0] == d[0] && c[1] == d[1])
|
||||
break;
|
||||
}
|
||||
if (il != nl) {
|
||||
uint16_t typ;
|
||||
|
||||
typ = kLanguageTagType;
|
||||
il++;
|
||||
numType = CFNumberCreate(NULL, kCFNumberSInt16Type,
|
||||
(const SInt16 *) (&typ));
|
||||
numSelector = CFNumberCreate(NULL, kCFNumberCFIndexType,
|
||||
&il);
|
||||
values[0] = numType;
|
||||
values[1] = numSelector;
|
||||
innerDict = CFDictionaryCreate(NULL,
|
||||
keys, values, 2,
|
||||
// TODO are these correct?
|
||||
&kCFCopyStringDictionaryKeyCallBacks,
|
||||
&kCFTypeDictionaryValueCallBacks);
|
||||
if (innerDict == NULL) {
|
||||
// TODO
|
||||
}
|
||||
CFArrayAppendValue(outerArray, innerDict);
|
||||
CFRelease(innerDict);
|
||||
CFRelease(numSelector);
|
||||
CFRelease(numType);
|
||||
}
|
||||
CFRelease(languages);
|
||||
}
|
||||
}
|
||||
|
||||
keys[0] = kCTFontFeatureSettingsAttribute;
|
||||
values[0] = outerArray;
|
||||
innerDict = CFDictionaryCreate(NULL,
|
||||
keys, values, 1,
|
||||
// TODO are these correct?
|
||||
&kCFCopyStringDictionaryKeyCallBacks,
|
||||
&kCFTypeDictionaryValueCallBacks);
|
||||
CFRelease(outerArray);
|
||||
new = CTFontDescriptorCreateCopyWithAttributes(desc, innerDict);
|
||||
CFRelease(desc);
|
||||
CFRelease(innerDict);
|
||||
return new;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
after UnderlineColor, before feature tags
|
||||
|
||||
// TODO document that this will also enable language-specific font features (TODO on DirectWrite too?)
|
||||
// TODO document that this should be strict BCP 47 form (A-Z, a-z, 0-9, and -) for maximum compatibility
|
||||
uiAttributeLanguage, // BCP 47 string
|
||||
Reference in new issue
Block a user