mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

(diacritic-composition-pattern): New constant.

Browse Source 
(diacritic-compose-region, diacritic-compose-string)
(diacritic-compose-buffer, diacritic-post-read-conversion)
(diacritic-composition-function): New functions.
This commit is contained in:
Dave Love 2001-12-07 14:49:08 +00:00
parent 269a5dd0ad
commit 5180cc015e
2 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lisp/ChangeLog
View File

@ -1,3 +1,30 @@
2001-12-07 Dave Love <fx@gnu.org>
* language/european.el (diacritic-composition-pattern): New constant.
(diacritic-compose-region, diacritic-compose-string)
(diacritic-compose-buffer, diacritic-post-read-conversion)
(diacritic-composition-function): New functions.
* international/utf-8.el (ucs-mule-to-mule-unicode): New
translation table.
(ccl-encode-mule-utf-8): Use it.
(utf-8-untranslated-to-ucs, utf-8-help-echo, utf-8-compose)
(utf-8-post-read-conversion, utf-8-pre-write-conversion): New
function.
(utf-8-subst-table): New variable.
(utf-8-compose-scripts): New option.
(mule-utf-8): Update safe-charsets, pre-write and post-read
conversion.
* international/ucs-tables.el, international/utf-8-subst.el: New
file.
* international/characters.el: Don't set word syntax (the default)
explicitly. Add a diacritic category. Add info for Unicode
equivalents of characters in various Mule charsets and for extra
Unicode characters. Don't define specific categories for
Indian/Devanagari, since they aren't used.
2001-12-06 Richard M. Stallman <rms@gnu.org>
* textmodes/fill.el (set-justification): Rename arg VALUE to STYLE.

60
lisp/language/european.el
View File

@ -542,6 +542,66 @@ but select's the Dutch tutorial."))
(valid-codes (0 . 255))
(mime-charset . macintosh))) ; per IANA, rfc1345
(defconst diacritic-composition-pattern "\\C^\\c^+")
;;;###autoload
(defun diacritic-compose-region (beg end)
"Compose diacritic characters in the region.
When called from a program, expects two arguments,
positions (integers or markers) specifying the region."
(interactive "r")
(save-restriction
(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)))))
;;;###autoload
(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))
(setq idx (match-end 0))))
string)
;;;###autoload
(defun diacritic-compose-buffer ()
"Compose diacritic characters in the current buffer."
(interactive)
(diacritic-compose-region (point-min) (point-max)))
;;;###autoload
(defun diacritic-post-read-conversion (len)
(diacritic-compose-region (point) (+ (point) len))
len)
;;;###autoload
(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
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^+" . diacrtic-composition-function))))
(let ((c #x300))
(while (<= c #x362)
(aset composition-function-table (decode-char 'ucs c) patterns)
(setq c (1+ c)))
(setq c #x20d0)
(while (<= c #x20e3)
(aset composition-function-table (decode-char 'ucs c) patterns)
(setq c (1+ c)))))
(provide 'european)
;;; european.el ends here