diff options
Diffstat (limited to 'src/nsfont.m')
| -rw-r--r-- | src/nsfont.m | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index ca94b07a6bd..7dfb995dd27 100644 --- a/src/nsfont.m +++ b/src/nsfont.m | |||
| @@ -256,7 +256,7 @@ ns_char_width (NSFont *sfont, int c) | |||
| 256 | 256 | ||
| 257 | 257 | ||
| 258 | /* Return whether set1 covers set2 to a reasonable extent given by pct. | 258 | /* Return whether set1 covers set2 to a reasonable extent given by pct. |
| 259 | We check, out of each 16 unicode char range containing chars in set2, | 259 | We check, out of each 16 Unicode char range containing chars in set2, |
| 260 | whether at least one character is present in set1. | 260 | whether at least one character is present in set1. |
| 261 | This must be true for pct of the pairs to consider it covering. */ | 261 | This must be true for pct of the pairs to consider it covering. */ |
| 262 | static BOOL | 262 | static BOOL |
| @@ -297,7 +297,7 @@ static NSString | |||
| 297 | 297 | ||
| 298 | 298 | ||
| 299 | /* Convert OTF 4-letter script code to emacs script name. (Why can't | 299 | /* Convert OTF 4-letter script code to emacs script name. (Why can't |
| 300 | everyone just use some standard unicode names for these?) */ | 300 | everyone just use some standard Unicode names for these?) */ |
| 301 | static NSString | 301 | static NSString |
| 302 | *ns_otf_to_script (Lisp_Object otf) | 302 | *ns_otf_to_script (Lisp_Object otf) |
| 303 | { | 303 | { |
| @@ -329,7 +329,7 @@ static NSString | |||
| 329 | 329 | ||
| 330 | /* Searches the :script, :lang, and :otf extra-bundle properties of the spec, | 330 | /* Searches the :script, :lang, and :otf extra-bundle properties of the spec, |
| 331 | plus registry regular property, for something that can be mapped to a | 331 | plus registry regular property, for something that can be mapped to a |
| 332 | unicode script. Empty string returned if no script spec found. */ | 332 | Unicode script. Empty string returned if no script spec found. */ |
| 333 | static NSString | 333 | static NSString |
| 334 | *ns_get_req_script (Lisp_Object font_spec) | 334 | *ns_get_req_script (Lisp_Object font_spec) |
| 335 | { | 335 | { |
| @@ -385,7 +385,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) | |||
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | 387 | ||
| 388 | /* Use the unicode range information in Vchar_script_table to convert a script | 388 | /* Use the Unicode range information in Vchar_script_table to convert a script |
| 389 | name into an NSCharacterSet. */ | 389 | name into an NSCharacterSet. */ |
| 390 | static NSCharacterSet | 390 | static NSCharacterSet |
| 391 | *ns_script_to_charset (NSString *scriptName) | 391 | *ns_script_to_charset (NSString *scriptName) |
| @@ -426,7 +426,7 @@ static NSCharacterSet | |||
| 426 | If none are found, we reduce the percentage and try again, until 5%. | 426 | If none are found, we reduce the percentage and try again, until 5%. |
| 427 | This provides a font with at least some characters if such can be found. | 427 | This provides a font with at least some characters if such can be found. |
| 428 | We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and | 428 | We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and |
| 429 | (b) need approximate match as fonts covering full unicode ranges are rare. */ | 429 | (b) need approximate match as fonts covering full Unicode ranges are rare. */ |
| 430 | static NSSet | 430 | static NSSet |
| 431 | *ns_get_covering_families (NSString *script, float pct) | 431 | *ns_get_covering_families (NSString *script, float pct) |
| 432 | { | 432 | { |
| @@ -1292,7 +1292,7 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block) | |||
| 1292 | if (!unichars || !(font_info->glyphs[block])) | 1292 | if (!unichars || !(font_info->glyphs[block])) |
| 1293 | abort (); | 1293 | abort (); |
| 1294 | 1294 | ||
| 1295 | /* create a string containing all unicode characters in this block */ | 1295 | /* create a string containing all Unicode characters in this block */ |
| 1296 | for (idx = block<<8, i =0; i<0x100; idx++, i++) | 1296 | for (idx = block<<8, i =0; i<0x100; idx++, i++) |
| 1297 | if (idx < 0xD800 || idx > 0xDFFF) | 1297 | if (idx < 0xD800 || idx > 0xDFFF) |
| 1298 | unichars[i] = idx; | 1298 | unichars[i] = idx; |
| @@ -1487,5 +1487,5 @@ syms_of_nsfont (void) | |||
| 1487 | DEFSYM (Qroman, "roman"); | 1487 | DEFSYM (Qroman, "roman"); |
| 1488 | DEFSYM (Qmedium, "medium"); | 1488 | DEFSYM (Qmedium, "medium"); |
| 1489 | DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, | 1489 | DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, |
| 1490 | doc: /* Internal use: maps font registry to unicode script. */); | 1490 | doc: /* Internal use: maps font registry to Unicode script. */); |
| 1491 | } | 1491 | } |