yatex

changeset 595:6f69504f9cbe dev

merged
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 29 Sep 2022 10:04:31 +0900
parents b9ba8aacbea6 638284a7a9d0
children 923a6c0183be
files
diffstat 10 files changed, 180 insertions(+), 61 deletions(-) [+]
line diff
     1.1 --- a/docs/qanda	Thu Dec 26 12:53:40 2019 +0859
     1.2 +++ b/docs/qanda	Thu Sep 29 10:04:31 2022 +0900
     1.3 @@ -427,8 +427,9 @@
     1.4  	
     1.5  	しばらく使うとこちらの方が便利だと感じると思います。もしそれでも
     1.6  	肌に合わない時は、C-c w m で常に修正モードをONにして使って下さい。
     1.7 -	変数 YaTeX-close-paren-always の値を nil にセットすると起動時か
     1.8 -	ら括弧の自動クローズをOFFにします。
     1.9 +	変数 YaTeX-close-paren-always の値を 'never にセットすると起動時
    1.10 +	から括弧の自動クローズをOFFにします。nil にセットするとポイント
    1.11 +	が行末にないときの自動クローズOFFにします。
    1.12  	
    1.13  ・; を押すと変なのがでて来たりする。
    1.14  	
     2.1 --- a/docs/qanda.eng	Thu Dec 26 12:53:40 2019 +0859
     2.2 +++ b/docs/qanda.eng	Thu Sep 29 10:04:31 2022 +0900
     2.3 @@ -292,10 +292,10 @@
     2.4  	
     2.5  *An open parenthesis always get entered in pairs.
     2.6  	
     2.7 -	This should  be better, once  you get used  to it.  If you still
     2.8 -	don't like    it, turn on modify-mode  using   C-c w m.  Setting
     2.9 -	YaTeX-close-paren-always to nil will  give this feature from the
    2.10 -	start.
    2.11 +	This should be better, once you get used to it.  If you still
    2.12 +	don't like it, turn on modify-mode using C-c w m.  Setting
    2.13 +	YaTeX-close-paren-always to 'never will give this feature from
    2.14 +	the start, nil will stop closing when not at end of line.
    2.15  	
    2.16  *Funny things happen when I hit ;.
    2.17  	
     3.1 --- a/help/YATEXHLP.eng	Thu Dec 26 12:53:40 2019 +0859
     3.2 +++ b/help/YATEXHLP.eng	Thu Sep 29 10:04:31 2022 +0900
     3.3 @@ -1765,6 +1765,12 @@
     3.4   \caption{foo image}\label{foo-jpg}
     3.5  \end{wrapfigure}
     3.6  
     3.7 +wraptable
     3.8 +\begin{wraptable}[LINES]{POS}[OVH]{WIDTH} ...TABULAR... \end{wraptable}
     3.9 +Create floating tabular.
    3.10 +Usage is the same as wrapfigure environment except enclosing tabular.
    3.11 +
    3.12 +<refer wrapfigure>
    3.13  
    3.14  abstract
    3.15  \begin{abstract} ... \end{abstract}
     4.1 --- a/help/YATEXHLP.jp	Thu Dec 26 12:53:40 2019 +0859
     4.2 +++ b/help/YATEXHLP.jp	Thu Sep 29 10:04:31 2022 +0900
     4.3 @@ -1771,6 +1771,7 @@
     4.4  OVH(省略可)	画像の張り出しマージン(\wrapoverhang 通常0)
     4.5  WIDTH		回り込みする(画像込みの)幅
     4.6  
     4.7 +
     4.8  【使用例】
     4.9  % プリアンブル
    4.10  \usepackage{wrapfig}
    4.11 @@ -1780,6 +1781,13 @@
    4.12   \caption{ほげほげ}\label{hoge-jpg}
    4.13  \end{wrapfigure}
    4.14  
    4.15 +wraptable
    4.16 +\begin{wraptable}[LINES]{POS}[OVH]{WIDTH} ...表... \end{wraptable}
    4.17 +左右回り込みの表を出力する(table環境と同様のフロート作成)。
    4.18 +内部にtabular系を入れる点以外についてはwrapfigureと同様。
    4.19 +
    4.20 +<refer wrapfigure>
    4.21 +
    4.22  abstract
    4.23  \begin{abstract} ... \end{abstract}
    4.24  抄録(アブストラクト)を出力する。
     5.1 --- a/yahtml.el	Thu Dec 26 12:53:40 2019 +0859
     5.2 +++ b/yahtml.el	Thu Sep 29 10:04:31 2022 +0900
     5.3 @@ -446,6 +446,7 @@
     5.4      ("option") ("datalist")
     5.5      ;;HTML5
     5.6      ("video") ("audio") ("figure") ("iframe")
     5.7 +    ("header") ("footer") ("article") ("section") ("nav") ("main") ("aside")
     5.8      ))
     5.9  
    5.10  (if yahtml-html4-strict
    5.11 @@ -1714,6 +1715,9 @@
    5.12     (yahtml-make-optional-argument
    5.13      "value" (yahtml-read-parameter "value"))))
    5.14  
    5.15 +(defun yahtml::article ()
    5.16 +  (setq yahtml-last-typeface-cmd "h1" yahtml-last-begend "h1"))
    5.17 +
    5.18  ;;; ---------- Simple tag ----------
    5.19  (defun yahtml-insert-tag (region-mode &optional tag)
    5.20    "Insert <TAG> </TAG> and put cursor inside of them."
     6.1 --- a/yatex.el	Thu Dec 26 12:53:40 2019 +0859
     6.2 +++ b/yatex.el	Thu Sep 29 10:04:31 2022 +0900
     6.3 @@ -1,6 +1,6 @@
     6.4  ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*-
     6.5 -;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org]
     6.6 -;;; Last modified Thu Dec 26 12:46:41 2019 on firestorm
     6.7 +;;; (c)1991-2020 by HIROSE Yuuji.[yuuji@yatex.org]
     6.8 +;;; Last modified Fri Sep 23 06:28:18 2022 on firestorm
     6.9  ;;; $Id$
    6.10  ;;; The latest version of this software is always available at;
    6.11  ;;; https://www.yatex.org/
    6.12 @@ -16,7 +16,7 @@
    6.13  
    6.14  ;;; Code:
    6.15  (require 'yatexlib)
    6.16 -(defconst YaTeX-revision-number "1.82"
    6.17 +(defconst YaTeX-revision-number "1.82.1"
    6.18    "Revision number of running yatex.el")
    6.19  
    6.20  ;---------- Local variables ----------
    6.21 @@ -182,7 +182,7 @@
    6.22  	  YaTeX-sectioning-regexp		;sectioning commands
    6.23  	  "\\|[A-z]*item\\|begin{\\|end{"	;special declaration
    6.24  	  "\\|\\[\\|\\]"
    6.25 -	  "\\|newpage\\b\\|vspace\\b"
    6.26 +	  "\\|newpage\\b\\|vspace\\b\\|par\\b"
    6.27  	  "\\)")
    6.28    "*Paragraph starting regexp of common LaTeX source.  Use this value
    6.29  for YaTeX-uncomment-paragraph.")
    6.30 @@ -192,7 +192,7 @@
    6.31  	  YaTeX-sectioning-regexp		;sectioning commands
    6.32  	  "\\|begin{\\|end{"			;special declaration
    6.33  	  "\\|\\[\\|\\]"
    6.34 -	  "\\|newpage\\b\\|vspace\\b"
    6.35 +	  "\\|newpage\\b\\|vspace\\b\\|par\\b"
    6.36  	  "\\)")
    6.37    "*Paragraph delimiter regexp of common LaTeX source.  Use this value
    6.38  for YaTeX-uncomment-paragraph.")
    6.39 @@ -315,6 +315,7 @@
    6.40       ("cline") ("framebox") ("savebox" 2) ("sbox" 2) ("newsavebox") ("usebox")
    6.41       ("date") ("put") ("ref") ("pageref") ("tabref") ("figref") ("raisebox" 2)
    6.42       ("multicolumn" 3) ("shortstack") ("parbox" 2)
    6.43 +     ("textcircled") ("fbox")
    6.44       ;; for mathmode accent
    6.45       ("tilde") ("hat") ("check") ("bar") ("dot") ("ddot") ("vec")
    6.46       ("widetilde") ("widehat") ("overline") ("overrightarrow")
    6.47 @@ -327,6 +328,8 @@
    6.48       ("subfigure")						;; subfigure
    6.49       ("ruby" 2) ("kenten")					;; okumacro
    6.50       ("geometry") ("path")
    6.51 +     ("setstretch")
    6.52 +     ("columncolor") ("rowcolor") ("cellcolor")			;; colortbl
    6.53       )
    6.54     (if YaTeX-use-LaTeX2e
    6.55         '(("documentclass") ("usepackage")
    6.56 @@ -402,7 +405,7 @@
    6.57       ("minipage") ("landscape")
    6.58       ("supertabular") ("floatingfigure") ("wrapfigure") ("wraptable")
    6.59       ("frame") ("block") ("example") ("columns") ("column")	;beamer
    6.60 -     ("tabularx")
    6.61 +     ("tabularx") ("spacing")
    6.62       )
    6.63     (if YaTeX-use-LaTeX2e
    6.64         '(("comment")			;defined in version
    6.65 @@ -424,7 +427,7 @@
    6.66  ; Set {\Large }-like completion
    6.67  (defvar fontsize-table
    6.68    '(("rm") ("em") ("bf") ("boldmath") ("it") ("sl") ("sf") ("sc") ("tt")
    6.69 -    ("dg") ("dm")
    6.70 +    ("dg") ("dm") ("mc") ("mcfamily") ("gt") ("gtfamily")
    6.71      ("tiny") ("scriptsize") ("footnotesize") ("small")("normalsize")
    6.72      ("large") ("Large") ("LARGE") ("huge") ("Huge")
    6.73      ("rmfamily") ("sffamily") ("ttfamily")
    6.74 @@ -437,6 +440,8 @@
    6.75    '(("rm" . "rmfamily")
    6.76      ("sf" . "sffamily")
    6.77      ("tt" . "ttfamily")
    6.78 +    ("mc" . "mcfamily")
    6.79 +    ("gt" . "gtfamily")
    6.80      ("md" . "mdseries")
    6.81      ("bf" . "bfseries")
    6.82      ("up" . "upshape")
    6.83 @@ -451,6 +456,7 @@
    6.84    (append
    6.85     '(("maketitle") ("makeindex") ("sloppy") ("protect") ("par") ("and")
    6.86       ("LaTeX") ("TeX") ("item") ("item[]") ("appendix") ("hline") ("kill")
    6.87 +     ("textbar") ("textbackslash")
    6.88       ;;("rightarrow") ("Rightarrow") ("leftarrow") ("Leftarrow")
    6.89       ("onecolumn") ("twocolumn")
    6.90       ("pagebreak") ("nopagebreak") ("tableofcontents")
    6.91 @@ -878,7 +884,7 @@
    6.92  ;; YaTeX-mode functions
    6.93  ;;;
    6.94  (defun YaTeX-insert-begin-end (env region-mode)
    6.95 -  "Insert \\begin{mode-name} and \\end{mode-name}.
    6.96 +  "Insert \\begin{env-name} and \\end{env-name}.
    6.97  This works also for other defined begin/end tokens to define the structure."
    6.98    (setq YaTeX-current-completion-type 'begin)
    6.99    (let*((ccol (current-column)) beg beg2 exchange
     7.1 --- a/yatexadd.el	Thu Dec 26 12:53:40 2019 +0859
     7.2 +++ b/yatexadd.el	Thu Sep 29 10:04:31 2022 +0900
     7.3 @@ -1,6 +1,6 @@
     7.4  ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*-
     7.5  ;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org]
     7.6 -;;; Last modified Thu Oct 17 09:44:48 2019 on firestorm
     7.7 +;;; Last modified Thu Sep 22 11:41:04 2022 on firestorm
     7.8  ;;; $Id$
     7.9  
    7.10  ;;; Code:
    7.11 @@ -193,15 +193,22 @@
    7.12  
    7.13  
    7.14  ;; wrapfig.sty
    7.15 -(defun YaTeX:wrapfigure ()
    7.16 -  (YaTeX-help "wrapfigure")
    7.17 -  (concat
    7.18 -   (let ((lines (YaTeX-read-string-or-skip "Wrap Lines(Optional): ")))
    7.19 -     (if (string< "" lines)
    7.20 -	 (concat "[" lines "]")))
    7.21 -   "{" (YaTeX:read-oneof "rlioRLIO" t) "}"
    7.22 -   "{" (YaTeX:read-length "Image width: ") "}"))
    7.23 - 
    7.24 +(defun YaTeX:wrapfigure (&optional kind)
    7.25 +  (setq kind (or kind "figure"))
    7.26 +  (YaTeX-help (concat "wrap" kind))
    7.27 +  (prog1
    7.28 +      (concat
    7.29 +       (let ((lines (YaTeX-read-string-or-skip "Wrap Lines(Optional): ")))
    7.30 +	 (if (string< "" lines)
    7.31 +	     (concat "[" lines "]")))
    7.32 +       "{" (YaTeX:read-oneof "rlioRLIO" t) "}"
    7.33 +       "{" (YaTeX:read-length (concat (capitalize kind) " width: ")) "}")
    7.34 +    (setq YaTeX-section-name "includegraphics")))
    7.35 +
    7.36 +(defun YaTeX:wraptable ()
    7.37 +  (prog1
    7.38 +      (YaTeX:wrapfigure "table")
    7.39 +    (setq YaTeX-env-name "tabular")))
    7.40  
    7.41  ;;;
    7.42  ;;Sample functions for section-type command.
    7.43 @@ -306,6 +313,11 @@
    7.44  (defun YaTeX:itembox ()
    7.45    (concat "{" (YaTeX-read-string-or-skip "Item heading string: ") "}"))
    7.46  
    7.47 +(defun YaTeX:spacing ()
    7.48 +  (concat "{" (read-string-with-history "Line spacing by: ") "}"))
    7.49 +(defun YaTeX::setstretch (argp)
    7.50 +  (read-string-with-history "Page global Line stretch factor: "))
    7.51 +
    7.52  ;;;
    7.53  ;;Sample functions for maketitle-type command.
    7.54  ;;;
    7.55 @@ -1981,6 +1993,48 @@
    7.56     ((= argp 2) (YaTeX::color-completing-read "Inner color: "))
    7.57     ((= argp 3) (YaTeX-read-string-or-skip "Colored string: "))))
    7.58  
    7.59 +(defun YaTeX:columncolor ()
    7.60 +  (let ((model (YaTeX-completing-read-or-skip
    7.61 +		"Color model: " '(("rgb") ("gray") ("named")))))
    7.62 +    (put 'YaTeX:columncolor 'model model)
    7.63 +    (if (string= "" model) "" (concat "[" model "]"))))
    7.64 +
    7.65 +(fset 'YaTeX:rowcolor 'YaTeX:columncolor)
    7.66 +(fset 'YaTeX:cellcolor 'YaTeX:columncolor)
    7.67 +
    7.68 +(defun YaTeX::columncolor (argp)
    7.69 +  (let ((model (get 'YaTeX:columncolor 'model))
    7.70 +	(type (cond ((string-match "column" YaTeX-section-name) "Column")
    7.71 +		    ((string-match "row" YaTeX-section-name) "Row")
    7.72 +		    ((string-match "cell" YaTeX-section-name) "Cell")
    7.73 +		    (t "Table")))
    7.74 +	(last (get 'YaTeX::columncolor 'last-color))
    7.75 +	str)
    7.76 +    (put 'YaTeX::columncolor 'last-color
    7.77 +	 (cond
    7.78 +	  ((equal model "rgb")
    7.79 +	   (setq str (YaTeX-read-string-or-skip
    7.80 +		      "R, G, B values: "
    7.81 +		      (cons (or last "0.6, 0.8, 0.9") 0)))
    7.82 +	   (cond
    7.83 +	    ((string-match ",.*," str) str)
    7.84 +	    ((string-match "\\(\\S +\\)\\s +\\(\\S +\\)\\s +\\(\\S +\\)" str)
    7.85 +	     (format "%s, %s, %s" (YaTeX-match-string 1 1 str)
    7.86 +		     (YaTeX-match-string 2 2 str)(YaTeX-match-string 3 3 str)))
    7.87 +	    (t (message "%s may cause error on typesetting" str)
    7.88 +	       str)))
    7.89 +	  ((equal model "gray")
    7.90 +	   (setq str (YaTeX-read-string-or-skip "Grayscale values(0.0 - 1.0): "))
    7.91 +	   (if (<= (string-to-number str) 1)
    7.92 +	       str
    7.93 +	     (message "%s may be an error.  Values from 0.0 to 1.0 are acceptable")
    7.94 +	     str))
    7.95 +	  ((equal model "named")
    7.96 +	   (YaTeX::color-completing-read (concat type " color")))
    7.97 +	  ))))
    7.98 +(fset 'YaTeX::rowcolor 'YaTeX::columncolor)
    7.99 +(fset 'YaTeX::cellcolor 'YaTeX::columncolor)
   7.100 +
   7.101  (defun YaTeX:scalebox ()
   7.102    "Add-in for \\scalebox"
   7.103    (let ((vmag (YaTeX-read-string-or-skip (if YaTeX-japan "倍率(負で反転): "
     8.1 --- a/yatexlib.el	Thu Dec 26 12:53:40 2019 +0859
     8.2 +++ b/yatexlib.el	Thu Sep 29 10:04:31 2022 +0900
     8.3 @@ -1,7 +1,7 @@
     8.4  ;;; yatexlib.el --- YaTeX and yahtml common libraries -*- coding: sjis -*-
     8.5  ;;; 
     8.6  ;;; (c)1994-2019 by HIROSE Yuuji.[yuuji@yatex.org]
     8.7 -;;; Last modified Thu Dec 26 12:47:45 2019 on firestorm
     8.8 +;;; Last modified Fri Sep 23 06:43:32 2022 on firestorm
     8.9  ;;; $Id$
    8.10  
    8.11  ;;; Code:
    8.12 @@ -119,6 +119,38 @@
    8.13    "*Main LaTeX source file name used when %#! expression doesn't exist.")
    8.14  (make-variable-buffer-local 'YaTeX-parent-file)
    8.15  
    8.16 +;;;
    8.17 +;; Emacs 21 compensational wrapper
    8.18 +;;;
    8.19 +(defun YaTeX-minibuffer-begin ()
    8.20 + (if (fboundp 'field-beginning)
    8.21 +     (field-beginning (point-max))
    8.22 +   (point-min)))
    8.23 +
    8.24 +(defun YaTeX-minibuffer-end ()
    8.25 + (if (fboundp 'field-end)
    8.26 +     (field-end (point-max))
    8.27 +   (point-max)))
    8.28 +
    8.29 +(defun YaTeX-minibuffer-string ()
    8.30 +  (buffer-substring (YaTeX-minibuffer-begin) (YaTeX-minibuffer-end)))
    8.31 +
    8.32 +(defun YaTeX-minibuffer-erase ()
    8.33 +  (if (eq (selected-window) (minibuffer-window))
    8.34 +      (if (fboundp 'delete-field) (delete-field) (erase-buffer))))
    8.35 +
    8.36 +(fset 'YaTeX-buffer-substring
    8.37 +      (if (fboundp 'buffer-substring-no-properties)
    8.38 +	  'buffer-substring-no-properties
    8.39 +	'buffer-substring))
    8.40 +(fset 'YaTeX-substring
    8.41 +      (if (fboundp 'substring-no-properties)
    8.42 +	  'substring-no-properties
    8.43 +	'substing))
    8.44 +
    8.45 +(defun YaTeX-region-active-p ()
    8.46 +  (and (fboundp 'region-active-p) (region-active-p)))
    8.47 +
    8.48  ;---------- Define default key bindings on YaTeX mode map ----------
    8.49  ;;;###autoload
    8.50  (defun YaTeX-kanji-ptex-mnemonic ()
    8.51 @@ -627,11 +659,14 @@
    8.52       (where-is-internal olddef keymap))))
    8.53  
    8.54  ;;;###autoload
    8.55 -(defun YaTeX-match-string (n &optional m)
    8.56 -  "Return (buffer-substring (match-beginning n) (match-beginning m))."
    8.57 +(defun YaTeX-match-string (n &optional m str)
    8.58 +  "Return (buffer-substring (match-beginning n) (match-beginning m)).
    8.59 +Optional third argument STR gives substring from string STR."
    8.60    (if (match-beginning n)
    8.61 -      (YaTeX-buffer-substring (match-beginning n)
    8.62 -			(match-end (or m n)))))
    8.63 +      (if str (YaTeX-substring
    8.64 +	       str (match-beginning m) (match-end (or m n)))
    8.65 +	(YaTeX-buffer-substring (match-beginning n)
    8.66 +				(match-end (or m n))))))
    8.67  
    8.68  ;;;###autoload
    8.69  (defun YaTeX-minibuffer-complete ()
    8.70 @@ -1385,34 +1420,6 @@
    8.71       bindlist))))
    8.72  
    8.73  ;;;
    8.74 -;; Emacs 21 compensational wrapper
    8.75 -;;;
    8.76 -(defun YaTeX-minibuffer-begin ()
    8.77 - (if (fboundp 'field-beginning)
    8.78 -     (field-beginning (point-max))
    8.79 -   (point-min)))
    8.80 -
    8.81 -(defun YaTeX-minibuffer-end ()
    8.82 - (if (fboundp 'field-end)
    8.83 -     (field-end (point-max))
    8.84 -   (point-max)))
    8.85 -
    8.86 -(defun YaTeX-minibuffer-string ()
    8.87 -  (buffer-substring (YaTeX-minibuffer-begin) (YaTeX-minibuffer-end)))
    8.88 -
    8.89 -(defun YaTeX-minibuffer-erase ()
    8.90 -  (if (eq (selected-window) (minibuffer-window))
    8.91 -      (if (fboundp 'delete-field) (delete-field) (erase-buffer))))
    8.92 -
    8.93 -(fset 'YaTeX-buffer-substring
    8.94 -      (if (fboundp 'buffer-substring-no-properties)
    8.95 -	  'buffer-substring-no-properties
    8.96 -	'buffer-substring))
    8.97 -
    8.98 -(defun YaTeX-region-active-p ()
    8.99 -  (and (fboundp 'region-active-p) (region-active-p)))
   8.100 -
   8.101 -;;;
   8.102  ;; hilit19 vs. font-lock
   8.103  ;;;
   8.104  (defvar YaTeX-19-functions-font-lock-direct
     9.1 --- a/yatexpkg.el	Thu Dec 26 12:53:40 2019 +0859
     9.2 +++ b/yatexpkg.el	Thu Sep 29 10:04:31 2022 +0900
     9.3 @@ -1,7 +1,7 @@
     9.4  ;;; yatexpkg.el --- YaTeX package manager -*- coding: sjis -*-
     9.5  ;;; 
     9.6  ;;; (c)2003-2019 by HIROSE, Yuuji [yuuji@yatex.org]
     9.7 -;;; Last modified Sat May 25 14:46:27 2019 on firestorm
     9.8 +;;; Last modified Thu Sep 22 20:20:37 2022 on firestorm
     9.9  ;;; $Id$
    9.10  
    9.11  ;;; Code:
    9.12 @@ -76,6 +76,7 @@
    9.13      ("cases"	(env "numcases" "subnumcases"))
    9.14      ("subfigure"	(section "subfigure"))
    9.15      ("okumacro"	(section "ruby" "kenten"))
    9.16 +    ("colortbl"	(section "columncolor" "rowcolor"))
    9.17      )
    9.18    "Default package vs. macro list.
    9.19  Alists contains '(PACKAGENAME . MACROLIST)
    10.1 --- a/yatexprc.el	Thu Dec 26 12:53:40 2019 +0859
    10.2 +++ b/yatexprc.el	Thu Sep 29 10:04:31 2022 +0900
    10.3 @@ -1,7 +1,7 @@
    10.4  ;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*-
    10.5  ;;; 
    10.6 -;;; (c)1993-2019 by HIROSE Yuuji.[yuuji@yatex.org]
    10.7 -;;; Last modified Thu Dec 26 12:48:12 2019 on firestorm
    10.8 +;;; (c)1993-2022 by HIROSE Yuuji.[yuuji@yatex.org]
    10.9 +;;; Last modified Thu Sep 29 09:56:02 2022 on firestorm
   10.10  ;;; $Id$
   10.11  
   10.12  ;;; Code:
   10.13 @@ -39,7 +39,8 @@
   10.14    (cond
   10.15     (YaTeX-dos (cdr (assq 1 YaTeX-kanji-code-alist)))
   10.16     (YaTeX-emacs-20
   10.17 -    (cdr (assoc latex-message-kanji-code YaTeX-kanji-code-alist)))
   10.18 +    (let ((sym (cdr (assoc latex-message-kanji-code YaTeX-kanji-code-alist))))
   10.19 +      (if (eq sym 'no-conversion) 'undecided sym)))
   10.20     ((boundp 'MULE)
   10.21      (symbol-value
   10.22       (cdr (assoc latex-message-kanji-code YaTeX-kanji-code-alist))))
   10.23 @@ -1149,6 +1150,37 @@
   10.24  	  t)				;for YaTeX-goto-corresponding-*
   10.25        nil)))
   10.26  
   10.27 +(and (or (featurep 'dbus) (load "dbus" t))
   10.28 +     ;; Cannot load dbus on emacs without dbus module
   10.29 +     (fboundp 'url-unhex-string)
   10.30 +     (fboundp 'dbus-register-signal)
   10.31 +     ;; From https://texwiki.texjp.org/?Emacs#vecb4fd9
   10.32 +     (progn
   10.33 +       (fset 'YaTeX-evince-inverse-search
   10.34 +	     (if (fboundp 'evince-inverse)
   10.35 +		 'evince-inverse	;Use previously defined one
   10.36 +	       (function
   10.37 +		(lambda (file linecol &rest args)
   10.38 +		  (let* ((fn (decode-coding-string
   10.39 +			      (url-unhex-string
   10.40 +			       (if (string-match "^file:///" file)
   10.41 +				   (substring file 7) file))
   10.42 +			      'utf-8))
   10.43 +			 (buf (YaTeX-switch-to-buffer fn))
   10.44 +			 (ln  (car linecol))
   10.45 +			 (col (car (cdr linecol))))
   10.46 +		    (if (null buf)
   10.47 +			(error "[Synctex]: Not found [%s]" file)
   10.48 +		      (goto-line ln)
   10.49 +		      (move-to-column (max 0 col))))))))
   10.50 +       (condition-case ()
   10.51 +	   (dbus-register-signal
   10.52 +	    :session nil "/org/gnome/evince/Window/0"
   10.53 +	    "org.gnome.evince.Window" "SyncSource"
   10.54 +            'YaTeX-evince-inverse-search)
   10.55 +	 (error
   10.56 +	  (message "Reverse search not available on this system.")))))
   10.57 +
   10.58  (defun YaTeX-set-virtual-error-position (file-sym line-sym)
   10.59    "Replace the value of FILE-SYM, LINE-SYM by virtual error position."
   10.60    (cond