comparison lisp/language/european.el @ 89919:80fad817819f

(diacritic-compose-region): Compose diacritical marks only with a character whose syntax is word constituent. (diacritic-compose-string): Likewise. (diacritic-composition-function): Likewise. (diacritic-post-read-conversion): Delete it.

89918:2d36fc270f24

  (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)))))

(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)

(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 (pos &optional string)
  "Compose diacritic text around POS.
Optional 2nd argument STRING, if non-nil, is a string containing text
to compose.

  (setq pos (1- pos))
  (if string
      (if (>= pos 0)
	  (let ((ch (aref string pos))
		start end components ch composition)
	    (when (and (>= ch 32) (or (< ch 127) (>= ch 160)))
	      (setq start pos
		    end (length string)
		    components (list ch)
		    pos (1+ pos))
	      (while (and

	      (compose-string string start pos (nreverse components))
	      pos)))
    (if (>= pos (point-min))
	(let ((ch (char-after pos))
	      start end components composition)
	  (when (and (>= ch 32) (or (< ch 127) (>= ch 160)))
	    (setq start pos
		  end (point-max)
		  components (list ch)
		  pos (1+ pos))
	    (while (and

89919:80fad817819f

  (interactive "r")
  (save-restriction
    (narrow-to-region beg end)
    (goto-char (point-min))
    (while (re-search-forward diacritic-composition-pattern nil t)
      (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))
      (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-composition-function (pos &optional string)
  "Compose diacritic text around POS.
Optional 2nd argument STRING, if non-nil, is a string containing text
to compose.

  (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

	      (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