Mercurial > hg > xemacs-beta
comparison src/mule-charset.c @ 406:b8cc9ab3f761 r21-2-33
Import from CVS: tag r21-2-33
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:17:09 +0200 |
parents | a86b2b5e0111 |
children | 697ef44129c6 |
comparison
equal
deleted
inserted
replaced
405:0e08f63c74d2 | 406:b8cc9ab3f761 |
---|---|
148 | 148 |
149 Lisp_Object Ql2r, Qr2l; | 149 Lisp_Object Ql2r, Qr2l; |
150 | 150 |
151 Lisp_Object Vcharset_hash_table; | 151 Lisp_Object Vcharset_hash_table; |
152 | 152 |
153 static Bufbyte next_allocated_1_byte_leading_byte; | |
154 static Bufbyte next_allocated_2_byte_leading_byte; | |
155 | |
156 /* Composite characters are characters constructed by overstriking two | 153 /* Composite characters are characters constructed by overstriking two |
157 or more regular characters. | 154 or more regular characters. |
158 | 155 |
159 1) The old Mule implementation involves storing composite characters | 156 1) The old Mule implementation involves storing composite characters |
160 in a buffer as a tag followed by all of the actual characters | 157 in a buffer as a tag followed by all of the actual characters |
527 { | 524 { |
528 int lb; | 525 int lb; |
529 | 526 |
530 if (dimension == 1) | 527 if (dimension == 1) |
531 { | 528 { |
532 if (next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1) | 529 if (chlook->next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1) |
533 lb = 0; | 530 lb = 0; |
534 else | 531 else |
535 lb = next_allocated_1_byte_leading_byte++; | 532 lb = chlook->next_allocated_1_byte_leading_byte++; |
536 } | 533 } |
537 else | 534 else |
538 { | 535 { |
539 if (next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2) | 536 if (chlook->next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2) |
540 lb = 0; | 537 lb = 0; |
541 else | 538 else |
542 lb = next_allocated_2_byte_leading_byte++; | 539 lb = chlook->next_allocated_2_byte_leading_byte++; |
543 } | 540 } |
544 | 541 |
545 if (!lb) | 542 if (!lb) |
546 signal_simple_error | 543 signal_simple_error |
547 ("No more character sets free for this dimension", | 544 ("No more character sets free for this dimension", |
1346 for (i = 0; i < countof (chlook->charset_by_attributes); i++) | 1343 for (i = 0; i < countof (chlook->charset_by_attributes); i++) |
1347 for (j = 0; j < countof (chlook->charset_by_attributes[0]); j++) | 1344 for (j = 0; j < countof (chlook->charset_by_attributes[0]); j++) |
1348 for (k = 0; k < countof (chlook->charset_by_attributes[0][0]); k++) | 1345 for (k = 0; k < countof (chlook->charset_by_attributes[0][0]); k++) |
1349 chlook->charset_by_attributes[i][j][k] = Qnil; | 1346 chlook->charset_by_attributes[i][j][k] = Qnil; |
1350 | 1347 |
1351 next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1; | 1348 chlook->next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1; |
1352 next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2; | 1349 chlook->next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2; |
1353 } | 1350 } |
1354 | 1351 |
1355 void | 1352 void |
1356 complex_vars_of_mule_charset (void) | 1353 complex_vars_of_mule_charset (void) |
1357 { | 1354 { |