(chise-tex-encode-region-for-utf-8-jis): Add setting for <COMBINING

MACRON> + <COMBINING ACUTE ACCENT>.

diff --git a/elisp/chise-tex.el b/elisp/chise-tex.el
index a1d275b..da16d28 100644 (file)
--- a/elisp/chise-tex.el
+++ b/elisp/chise-tex.el
@@ -464,22 +464,28 @@
                   (setq base (car ret))
                   (if (and (setq ret (char-feature base '=decomposition))
                            (setq modifier-1
                   (setq base (car ret))
                   (if (and (setq ret (char-feature base '=decomposition))
                            (setq modifier-1

-                                 (assq (car modifier)
-                                       (cdr
-                                        (assq (nth 1 ret)
-                                              '((?\u0302
-                                                 (?\u0300 . "\\CircGrave{%c}")
-                                                 (?\u0301 . "\\'{\\^%c}")
-                                                 (?\u0303 . "\\~{\\^%c}")
-                                                 (?\u0309 . "\\CircHook{%c}")
-                                                 )
-                                                (?\u031B
-                                                 (?\u0301 . "\\HornAcute{%c}")
-                                                 (?\u0303 . "\\HornTilde{%c}")
-                                                 )
-                                                (?\u0323
-                                                 (?\u0302 . "\\Circudot{%c}")
-                                                 )))))))
+                                 (assq
+                                  (car modifier)
+                                  (cdr
+                                   (assq
+                                    (nth 1 ret)
+                                    '((?\u0302
+                                       (?\u0300 . "\\CircGrave{%c}")
+                                       (?\u0301 . "\\'{\\^%c}")
+                                       (?\u0303 . "\\~{\\^%c}")
+                                       (?\u0309 . "\\CircHook{%c}")
+                                       )
+                                      (?\u0304 ; <COMBINING MACRON>
+                                       (?\u0301 ; <COMBINING ACUTE ACCENT>
+                                        . "\\textacutemacron{%c}")
+                                       )
+                                      (?\u031B
+                                       (?\u0301 . "\\HornAcute{%c}")
+                                       (?\u0303 . "\\HornTilde{%c}")
+                                       )
+                                      (?\u0323
+                                       (?\u0302 . "\\Circudot{%c}")
+                                       )))))))

                       (insert (format (cdr modifier-1) (car ret)))
                     (insert (format "\\%s{%c}" (cdr modifier) base))))
                  ((and (or (encode-char chr '=jis-x0213-1-2000)
                       (insert (format (cdr modifier-1) (car ret)))
                     (insert (format "\\%s{%c}" (cdr modifier) base))))
                  ((and (or (encode-char chr '=jis-x0213-1-2000)