;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*-
;; Copyright (C) 1995, 1997, 2001 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+;; Licensed to the Free Software Foundation.
+;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003
+;; National Institute of Advanced Industrial Science and Technology (AIST)
+;; Registration Number H13PRO009
;; Keywords: multilingual, European
;;; Commentary:
-;; For European scripts, character sets ISO8859-1,2,3,4,9,14,15 are
-;; supported.
+;; For European scripts, all the ISO Latin character sets are
+;; supported, along with various others.
;;; Code:
(set-language-info-alist
"Latin-1" '((charset iso-8859-1)
- (coding-system iso-latin-1)
+ (coding-system iso-latin-1 iso-latin-9 windows-1252)
(coding-priority iso-latin-1)
(nonascii-translation . iso-8859-1)
- (unibyte-syntax . "latin-1")
(unibyte-display . iso-latin-1)
(input-method . "latin-1-prefix")
(sample-text
- . "Hello, Hej, Tere, Hei, Bonjour, Gr\e,A|_\e(B Gott, Ciao, \e,A!\e(BHola!")
+ . "Hello, Hej, Tere, Hei, Bonjour, Gr\e$(D+d)N\e(B Gott, Ciao, \e$(D"B\e(BHola!")
(documentation . "\
This language environment is a generic one for the Latin-1 (ISO-8859-1)
character set which supports the following European languages:
We also have specific language environments for the following languages:
For Dutch, \"Dutch\".
For German, \"German\".
- For Spanish, \"Spanish\".
For French, \"French\".
+ For Italian, \"Italian\".
+ For Slovenian, \"Slovenian\".
+ For Spanish, \"Spanish\".
Latin-1 also covers several written languages outside Europe, including
Indonesian/Malay, Tagalog (Philippines), Swahili and Afrikaans."))
(set-language-info-alist
"Latin-2" '((charset iso-8859-2)
- (coding-system iso-latin-2)
+ (coding-system iso-latin-2 windows-1250)
(coding-priority iso-latin-2)
(nonascii-translation . iso-8859-2)
- (unibyte-syntax . "latin-2")
(unibyte-display . iso-latin-2)
(input-method . "latin-2-prefix")
(documentation . "\
and Swedish.
We also have specific language environments for the following languages:
For Czech, \"Czech\".
+ For Croatian, \"Croatian\".
+ For Polish, \"Polish\".
For Romanian, \"Romanian\".
For Slovak, \"Slovak\"."))
'("European"))
(coding-system iso-latin-3)
(coding-priority iso-latin-3)
(nonascii-translation . iso-8859-3)
- (unibyte-syntax . "latin-3")
(unibyte-display . iso-latin-3)
(input-method . "latin-3-prefix")
(documentation . "\
(coding-system iso-8859-4)
(coding-priority iso-8859-4)
(nonascii-translation . iso-8859-4)
- (unibyte-syntax . "latin-4")
(unibyte-display . iso-8859-4)
(input-method . "latin-4-postfix")
(documentation . "\
(coding-system iso-latin-5)
(coding-priority iso-latin-5)
(nonascii-translation . iso-8859-9)
- (unibyte-syntax . "latin-5")
(unibyte-display . iso-latin-5)
(input-method . "latin-5-postfix")
- (documentation . "Support for Turkish language."))
+ (documentation . "Support for Latin-5.\
+See also the Turkish environment."))
+ '("European"))
+
+\f
+;; Latin-6 (ISO-8859-10)
+
+(define-coding-system 'iso-latin-6
+ "ISO 2022 based 8-bit encoding for Latin-6 (MIME:ISO-8859-10)."
+ :coding-type 'charset
+ :mnemonic ?9
+ :charset-list '(iso-8859-10)
+ :mime-charset 'iso-8859-10)
+
+(define-coding-system-alias 'iso-8859-10 'iso-latin-6)
+(define-coding-system-alias 'latin-6 'iso-latin-6)
+
+(set-language-info-alist
+ "Latin-6" '((charset iso-8859-10)
+ (coding-system iso-latin-6)
+ (coding-priority iso-latin-6)
+ (nonascii-translation . iso-8859-10)
+ (unibyte-display . iso-latin-6)
+ ;; Fixme: input method.
+ (documentation . "Support for generic Latin-6 (Northern European)."))
'("European"))
\f
+;; Latin-7 (ISO-8859-13)
+
+(define-coding-system 'iso-latin-7
+ "ISO 2022 based 8-bit encoding for Latin-7 (MIME:ISO-8859-13)."
+ :coding-type 'charset
+ :mnemonic ?9
+ :charset-list '(iso-8859-13)
+ :mime-charset 'iso-8859-13)
+
+(define-coding-system-alias 'iso-8859-13 'iso-latin-7)
+(define-coding-system-alias 'latin-7 'iso-latin-7)
+
+(set-language-info-alist
+ "Latin-7" '((charset iso-8859-13)
+ (coding-system iso-latin-7)
+ (coding-priority iso-latin-7)
+ (nonascii-translation . iso-8859-13)
+ (unibyte-display . iso-latin-7)
+ ;; Fixme: input method.
+ (documentation . "Support for generic Latin-7 (Baltic Rim)."))
+ '("European"))
+\f
;; Latin-8 (ISO-8859-14)
(define-coding-system 'iso-latin-8
(coding-system iso-latin-8)
(coding-priority iso-latin-8)
(nonascii-translation . iso-8859-14)
- (unibyte-syntax . "latin-8")
(unibyte-display . iso-latin-8)
(input-method . "latin-8-prefix")
;; Fixme: Welsh/Ga{e}lic greetings
- (sample-text . "\e,_"\e(B \e,_p\e(B \e,_^\e(B")
+ (sample-text . "\e,_"\e(B \e$(D+q\e(B \e$(D*t\e(B")
(documentation . "\
This language environment is a generic one for the Latin-8 (ISO-8859-14)
character set which supports the Celtic languages, including those not
(coding-system iso-latin-9)
(coding-priority iso-latin-9)
(nonascii-translation . iso-8859-15)
- (unibyte-syntax . "latin-9")
(unibyte-display . iso-latin-9)
(input-method . "latin-9-prefix")
(sample-text
- . "AVE. \e,B)9.>\e,b<=\e,_/\e(B \e,b$\e(B")
+ . "AVE. \e$(D*^+^*v+v)-)M*s\e(B \e$(Q)!\e(B")
(documentation . "\
This language environment is a generic one for the Latin-9 (ISO-8859-15)
character set which supports the same languages as Latin-1 with the
Latin-9 is sometimes nicknamed `Latin-0'."))
'("European"))
\f
+(define-coding-system 'windows-1250
+ "windows-1250 (Central European) encoding (MIME: WINDOWS-1250)"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(windows-1250)
+ :mime-charset 'windows-1250)
+(define-coding-system-alias 'cp1250 'windows-1250)
+
+(define-coding-system 'windows-1252
+ "windows-1252 (Western European) encoding (MIME: WINDOWS-1252)"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(windows-1252)
+ :mime-charset 'windows-1252)
+(define-coding-system-alias 'cp1252 'windows-1252)
+
+(define-coding-system 'windows-1254
+ "windows-1254 (Turkish) encoding (MIME: WINDOWS-1254)"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(windows-1254)
+ :mime-charset 'windows-1254)
+(define-coding-system-alias 'cp1254 'windows-1254)
+
+(define-coding-system 'windows-1257
+ "windows-1257 (Baltic) encoding (MIME: WINDOWS-1257)"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(windows-1257)
+ :mime-charset 'windows-1257)
+(define-coding-system-alias 'cp1257 'windows-1257)
+
+(define-coding-system 'cp850
+ "DOS codepage 850 (Western European)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp850)
+ :mime-charset 'cp850)
+(define-coding-system-alias 'ibm850 'cp850)
+
+(define-coding-system 'cp852
+ "DOS codepage 852 (Slavic)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp852)
+ :mime-charset 'cp852)
+(define-coding-system-alias 'ibm852 'cp852)
+
+(define-coding-system 'cp857
+ "DOS codepage 857 (Turkish)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp857)
+ :mime-charset 'cp857)
+(define-coding-system-alias 'ibm857 'cp857)
+
+(define-coding-system 'cp858
+ "Codepage 858 (Multilingual Latin I + Euro)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp858)
+ :mime-charset 'cp858)
+
+(define-coding-system 'cp860
+ "DOS codepage 860 (Portuguese)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp860)
+ :mime-charset 'cp860)
+(define-coding-system-alias 'ibm860 'cp860)
+
+(define-coding-system 'cp861
+ "DOS codepage 861 (Icelandic)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp861)
+ :mime-charset 'cp861)
+(define-coding-system-alias 'ibm861 'cp861)
+
+(define-coding-system 'cp863
+ "DOS codepage 863 (French Canadian)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp863)
+ :mime-charset 'cp863)
+(define-coding-system-alias 'ibm863 'cp863)
+
+(define-coding-system 'cp865
+ "DOS codepage 865 (Norwegian/Danish)"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp865)
+ :mime-charset 'cp865)
+(define-coding-system-alias 'ibm865 'cp865)
+
+(define-coding-system 'cp437
+ "DOS codepage 437"
+ :coding-type 'charset
+ :mnemonic ?D
+ :charset-list '(cp437)
+ :mime-charset 'cp437)
+(define-coding-system-alias 'ibm437 'cp437)
+\f
+(set-language-info-alist
+ "Dutch" '((tutorial . "TUTORIAL.nl")
+ (charset iso-8859-1)
+ (coding-system iso-latin-1 iso-latin-9)
+ (coding-priority iso-latin-1)
+ (nonascii-translation . iso-8859-1)
+ (unibyte-display . iso-latin-1)
+ (input-method . "dutch")
+ (sample-text . "Er is een aantal manieren waarop je dit kan doen")
+ (documentation . "\
+This language environment is almost the same as Latin-1,
+but it selects the Dutch tutorial and input method."))
+ '("European"))
+
(set-language-info-alist
"German" '((tutorial . "TUTORIAL.de")
(charset iso-8859-1)
- (coding-system iso-latin-1)
+ (coding-system iso-latin-1 iso-latin-9)
(coding-priority iso-latin-1)
(nonascii-translation . iso-8859-1)
(input-method . "german-postfix")
- (unibyte-syntax . "latin-1")
(unibyte-display . iso-latin-1)
(sample-text . "\
German (Deutsch Nord) Guten Tag
-German (Deutsch S\e,A|\e(Bd) Gr\e,A|_\e(B Gott")
+German (Deutsch S\e$(D+d\e(Bd) Gr\e$(D+d)N\e(B Gott")
(documentation . "\
This language environment is almost the same as Latin-1,
but sets the default input method to \"german-postfix\".
(set-language-info-alist
"French" '((tutorial . "TUTORIAL.fr")
(charset iso-8859-1)
- (coding-system iso-latin-1)
+ (coding-system iso-latin-1 iso-latin-9)
(coding-priority iso-latin-1)
(nonascii-translation . iso-8859-1)
- (unibyte-syntax . "latin-1")
(unibyte-display . iso-latin-1)
(input-method . "latin-1-prefix")
- (sample-text . "French (Fran\e,Ag\e(Bais) Bonjour, Salut")
+ (sample-text . "French (Fran\e$(D+.\e(Bais) Bonjour, Salut")
(documentation . "\
This language environment is almost the same as Latin-1,
-but it selects the French tutorial."))
+but it selects the French tutorial and input method."))
+ '("European"))
+
+(set-language-info-alist
+ "Italian" '((tutorial . "TUTORIAL.it")
+ (charset iso-8859-1)
+ (coding-system iso-latin-1 iso-latin-9)
+ (coding-priority iso-latin-1)
+ (nonascii-translation . iso-8859-1)
+ (unibyte-display . iso-latin-1)
+ (input-method . "italian-postfix")
+ (sample-text . "Salve, ciao!")
+ (documentation . "\
+This language environment is almost the same as Latin-1,
+but sets the default input method to \"italian-postfix\".
+Additionally, it selects the Italian tutorial."))
'("European"))
(set-language-info-alist
"Slovenian" '((charset iso-8859-2)
- (coding-system . (iso-8859-2))
+ (coding-system . (iso-8859-2 windows-1250))
(coding-priority . (iso-8859-2))
(nonascii-translation . iso-8859-2)
- (input-method . "latin-2-postfix")
- (unibyte-syntax . "latin-2")
+ (input-method . "slovenian")
(unibyte-display . iso-8859-2)
(tutorial . "TUTORIAL.sl")
- (sample-text . "\e,B.\e(Belimo vam uspe\e,B9\e(Ben dan!")
- (documentation . t))
+ (sample-text . "\e$(D*v\e(Belimo vam uspe\e$(D+^\e(Ben dan!")
+ (documentation . "\
+This language environment is almost the same as Latin-2,
+but it selects the Slovenian tutorial and input method."))
'("European"))
(set-language-info-alist
"Spanish" '((tutorial . "TUTORIAL.es")
(charset iso-8859-1)
- (coding-system iso-latin-1)
+ (coding-system iso-latin-1 iso-latin-9)
(coding-priority iso-latin-1)
- (nonascii-translation . iso-8859-1)
(input-method . "spanish-postfix")
- (unibyte-syntax . "latin-1")
+ (nonascii-translation . iso-8859-1)
(unibyte-display . iso-latin-1)
- (sample-text . "Spanish (Espa\e,Aq\e(Bol) \e,A!\e(BHola!")
+ (sample-text . "Spanish (Espa\e$(D+P\e(Bol) \e$(D"B\e(BHola!")
(documentation . "\
This language environment is almost the same as Latin-1,
but it sets the default input method to \"spanish-postfix\",
and it selects the Spanish tutorial."))
'("European"))
-(set-language-info-alist
- "Dutch" '((tutorial . "TUTORIAL.nl")
- (charset iso-8859-1)
- (coding-system iso-latin-1)
- (coding-priority iso-latin-1)
- (nonascii-translation . iso-8859-1)
- (unibyte-syntax . "latin-1")
- (unibyte-display . iso-latin-1)
- (sample-text . "Er is een aantal manieren waarop je dit kan doen")
- (documentation . "\
-This language environment is almost the same as Latin-1,
-but it selects the Dutch tutorial."))
- '("European"))
-
;; For Turkish, the character set ISO-8859-9 (Latin-5) is used. But,
;; before the introduction of ISO-8859-9 in 1988, ISO-8859-3 (Latin-3)
;; was used for Turkish. Those who use Latin-3 for Turkish should use
(set-language-info-alist
"Turkish" '((charset iso-8859-9)
- (coding-system iso-latin-5)
+ (coding-system iso-latin-5 windows-1254 iso-latin-3)
(coding-priority iso-latin-5)
(nonascii-translation . iso-8859-9)
- (unibyte-syntax . "latin-5")
(unibyte-display . iso-latin-5)
(input-method . "turkish-postfix")
- (sample-text . "Turkish (T\e,A|\e(Brk\e,Ag\e(Be) Merhaba")
- (documentation . t)))
+ (sample-text . "Turkish (T\e$(D+d\e(Brk\e$(D+.\e(Be) Merhaba")
+ (setup-function
+ . (lambda ()
+ (set-case-syntax-pair ?I ?\e$(D)E\e(B (standard-case-table))
+ (set-case-syntax-pair ?\e$(D*D\e(B ?i (standard-case-table))))
+ (exit-function
+ . (lambda ()
+ (set-case-syntax-pair ?I ?i (standard-case-table))
+ (set-case-syntax ?\e$(D)E\e(B "w" (standard-case-table))
+ (set-case-syntax ?\e$(D*D\e(B "w" (standard-case-table))))
+ (documentation . "Support for Turkish.
+Differs from the Latin-5 environment in using the `turkish-postfix' input
+method and applying Turkish case rules for the characters i, I, \e$(D)E\e(B, \e$(D*D\e(B.")))
;; Polish ISO 8859-2 environment.
;; Maintainer: Wlodek Bzyl <matwb@univ.gda.pl>
;; Keywords: multilingual, Polish
(set-language-info-alist
- "Polish" '((charset . (iso-8859-2))
- (coding-system . (iso-8859-2))
- (coding-priority . (iso-8859-2))
- (nonascii-translation . iso-8859-2)
+ "Polish" '((charset iso-8859-2)
+ (coding-system iso-8859-2 windows-1250)
+ (coding-priority iso-8859-2)
(input-method . "polish-slash")
- (unibyte-syntax . "latin-2")
+ (nonascii-translation . iso-8859-2)
(unibyte-display . iso-8859-2)
(tutorial . "TUTORIAL.pl")
- (sample-text . "P\e,As\e(Bjd\e,B<\e(B, ki\e,Bq\e(B-\e,B?\e(Be t\e,Bj\e(B chmurno\e,B6f\e(B w g\e,B31\e(Bb flaszy")
+ (sample-text . "P\e$(D+Q\e(Bjd\e$(D+u\e(B, ki\e$(D+M\e(B-\e$(D+w\e(Be t\e$(D+8\e(B chmurno\e$(D+\++\e(B w g\e$(D)H+(\e(Bb flaszy")
(documentation . t))
'("European"))
(documentation . "Support for Welsh, using Unicode."))
'("European"))
+(set-language-info-alist
+ "Latin-6" `((coding-system latin-6)
+ (coding-priority latin-6)
+ (nonascii-translation . ,(get 'decode-iso-latin-6 'translation-table))
+ (input-method . "latin-prefix")
+ (features code-pages)
+ (documentation . "Support for Latin-6."))
+ '("European"))
+
(set-language-info-alist
"Latin-7" `((coding-system latin-7)
(coding-priority latin-7)
(nonascii-translation . iso-8859-13)
- ;; Fixme: input-method
- (features code-pages)
+ (input-method . "latin-prefix")
(documentation . "Support for Latin-7, e.g. Latvian, Lithuanian."))
'("European"))
(set-language-info-alist
- "Lithuanian" `((coding-system latin-7)
+ "Lithuanian" `((coding-system latin-7 windows-1257)
(coding-priority latin-7)
(nonascii-translation . iso-8859-13)
(input-method . "lithuanian-keyboard")
- (features code-pages)
(documentation . "Support for Lithuanian."))
'("European"))
(set-language-info-alist
- "Latvian" `((coding-system latin-7)
+ "Latvian" `((coding-system latin-7 windows-1257)
(coding-priority latin-7)
(nonascii-translation . iso-8859-13)
(input-method . "latvian-keyboard")
- (features code-pages)
(documentation . "Support for Latvian."))
'("European"))
+(set-language-info-alist
+ "Swedish" '((tutorial . "TUTORIAL.sv")
+ (charset iso-8859-1)
+ (coding-system iso-latin-1)
+ (coding-priority iso-latin-1)
+ (nonascii-translation . iso-8859-1)
+ (unibyte-display . iso-latin-1)
+ (sample-text . "Goddag Hej")
+ (documentation . "Support for Swedish"))
+ '("European"))
+
+(set-language-info-alist
+ "Croatian" '((charset iso-8859-2)
+ (coding-system iso-8859-2)
+ (coding-priority iso-8859-2)
+ (input-method . "croatian")
+ (nonascii-translation . iso-8859-2)
+ (unibyte-display . iso-8859-2)
+ (documentation . "Support for Croatian with Latin-2 encoding."))
+ '("European"))
+
+(set-language-info-alist
+ "Brazilian Portuguese" '((tutorial . "TUTORIAL.pt_BR")
+ (charset iso-8859-1)
+ (coding-system iso-latin-1 iso-latin-9)
+ (coding-priority iso-latin-1)
+ (nonascii-translation . iso-8859-1)
+ (unibyte-display . iso-8859-1)
+ (input-method . "latin-1-prefix")
+ (sample-text . "Oi")
+ (documentation . "Support for Brazilian Portuguese."))
+ '("European"))
+
\f
(define-coding-system 'mac-roman
"Mac Roman Encoding (MIME:MACINTOSH)."
:coding-type 'charset
:mnemonic ?M
:charset-list '(mac-roman)
- ;; per IANA, rfc1345
:mime-charset 'macintosh)
+(define-coding-system 'next
+ "NeXTstep encoding"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(next)
+ :mime-charset 'next)
+
+(define-coding-system 'hp-roman8
+ "Hewlet-Packard roman-8 encoding (MIME:ROMAN-8)"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(hp-roman8)
+ :mime-charset 'hp-roman8)
+(define-coding-system-alias 'roman8 'hp-roman8)
+
+(define-coding-system 'adobe-standard-encoding
+ "Adobe `standard' encoding for PostScript"
+ :coding-type 'charset
+ :mnemonic ?*
+ :charset-list '(adobe-standard-encoding)
+ :mime-charset 'adobe-standard-encoding)
+
+\f
+;; For automatic composing of diacritics and combining marks.
+(dolist (range '( ;; combining diacritical marks
+ (#x0300 #x0314 (tc . bc))
+ (#x0315 (tr . bl))
+ (#x0316 #x0319 (bc . tc))
+ (#x031A (tr . cl))
+ (#x031B #x0320 (bc . tc))
+ (#x0321 (Br . tr))
+ (#x0322 (Br . tl))
+ (#x0323 #x0333 (bc . tc))
+ (#x0334 #x0338 (Bc . Bc))
+ (#x0339 #x033C (bc . tc))
+ (#x033D #x033F (tc . bc))
+ (#x0340 (tl . bc))
+ (#x0341 (tr . bc))
+ (#x0342 #x0344 (tc . bc))
+ (#x0345 (bc . tc))
+ (#x0346 (tc . bc))
+ (#x0347 #x0349 (bc . tc))
+ (#x034A #x034C (tc . bc))
+ (#x034D #x034E (bc . tc))
+ ;; combining diacritical marks for symbols
+ (#x20D0 #x20D1 (tc . bc))
+ (#x20D2 #x20D3 (Bc . Bc))
+ (#x20D4 #x20D7 (tc . bc))
+ (#x20D8 #x20DA (Bc . Bc))
+ (#x20DB #x20DC (tc . bc))
+ (#x20DD #x20E0 (Bc . Bc))
+ (#x20E1 (tc . bc))
+ (#x20E2 #x20E3 (Bc . Bc))))
+ (let* ((from (car range))
+ (to (if (= (length range) 3)
+ (nth 1 range)
+ from))
+ (composition (car (last range))))
+ (while (<= from to)
+ (put-char-code-property from 'diacritic-composition composition)
+ (aset composition-function-table from 'diacritic-composition-function)
+ (setq from (1+ from)))))
+
(defconst diacritic-composition-pattern "\\C^\\c^+")
(defun diacritic-compose-region (beg end)
(narrow-to-region beg end)
(goto-char (point-min))
(while (re-search-forward diacritic-composition-pattern nil t)
- (compose-region (match-beginning 0) (match-end 0)))))
+ (if (= (char-syntax (char-after (match-beginning 0))) ?w)
+ (compose-region (match-beginning 0) (match-end 0))))))
(defun diacritic-compose-string (string)
"Compose diacritic characters in STRING and return the resulting string."
(let ((idx 0))
(while (setq idx (string-match diacritic-composition-pattern string idx))
- (compose-string string idx (match-end 0))
+ (if (= (char-syntax (aref string idx)) ?w)
+ (compose-string string idx (match-end 0)))
(setq idx (match-end 0))))
string)
-
+
(defun diacritic-compose-buffer ()
"Compose diacritic characters in the current buffer."
(interactive)
(diacritic-compose-region (point-min) (point-max)))
-(defun diacritic-post-read-conversion (len)
- (diacritic-compose-region (point) (+ (point) len))
- len)
-
-(defun diacritic-composition-function (from to pattern &optional string)
- "Compose diacritic text in the region FROM and TO.
-The text matches the regular expression PATTERN.
-Optional 4th argument STRING, if non-nil, is a string containing text
+(defun diacritic-composition-function (pos &optional string)
+ "Compose diacritic text around POS.
+Optional 2nd argument STRING, if non-nil, is a string containing text
to compose.
-The return value is number of composed characters."
- (if (< (1+ from) to)
- (prog1 (- to from)
- (if string
- (compose-string string from to)
- (compose-region from to))
- (- to from))))
-
-;; Register a function to compose Unicode diacrtics and marks.
-(let ((patterns '(("\\C^\\c^+" . diacritic-composition-function))))
- (let ((c #x300))
- (while (<= c #x362)
- (aset composition-function-table (decode-char 'unicode c) patterns)
- (setq c (1+ c)))
- (setq c #x20d0)
- (while (<= c #x20e3)
- (aset composition-function-table (decode-char 'unicode c) patterns)
- (setq c (1+ c)))))
+The return value is the end position of composed characters,
+or nil if no characters are composed."
+ (setq pos (1- pos))
+ (if string
+ (if (>= pos 0)
+ (let ((ch (aref string pos))
+ start end components ch composition)
+ (when (= (char-syntax ch) ?w)
+ (setq start pos
+ end (length string)
+ components (list ch)
+ pos (1+ pos))
+ (while (and
+ (< pos end)
+ (setq ch (aref string pos)
+ composition
+ (get-char-code-property ch
+ 'diacritic-composition)))
+ (setq components (cons ch (cons composition components))
+ pos (1+ pos)))
+ (compose-string string start pos (nreverse components))
+ pos)))
+ (if (>= pos (point-min))
+ (let ((ch (char-after pos))
+ start end components composition)
+ (when (= (char-syntax ch) ?w)
+ (setq start pos
+ end (point-max)
+ components (list ch)
+ pos (1+ pos))
+ (while (and
+ (< pos end)
+ (setq ch (char-after pos)
+ composition
+ (get-char-code-property ch 'diacritic-composition)))
+ (setq components (cons ch (cons composition components))
+ pos (1+ pos)))
+ (compose-region start pos (nreverse components))
+ pos)))))
(provide 'european)
+;;; arch-tag: 9e018b12-fb02-4120-907b-9adeaf84b5c2
;;; european.el ends here
HCoop / bpt / emacs.git / blobdiff