# HG changeset patch # User HIROSE Yuuji # Date 1418695958 -32400 # Node ID 9cef5d10a0f1dbdfb3e814a8e488bdc507e969d0 # Parent fdbc3b60a09d3534f84b3735b5868f20a4733f45 First Drag-n-Drop support diff -r fdbc3b60a09d -r 9cef5d10a0f1 docs/yatexe --- a/docs/yatexe Wed Nov 26 09:41:56 2014 +0900 +++ b/docs/yatexe Tue Dec 16 11:12:38 2014 +0900 @@ -376,6 +376,9 @@ `%#MAKEINDEX' ... Command line for bibtex ([prefix] t b) + `%#DVIPDF' + + ... Command line for dvipdf(mx) ([prefix] t b) If you want to invoke "makeidx hogehoge" to update index, put the next line some upper place in the source, for example. @@ -2178,69 +2181,70 @@ HIROSE Yuuji +  Tag table: -Node: Top256 -Node: What is YaTeX?1597 -Node: Main features1970 -Node: Installation3499 -Node: Typesetting4276 -Node: Calling typesetter5406 -Node: Calling previewer7610 -Node: Printing out7971 -Node: %#notation8263 -Node: Changing typesetter8681 -Node: Splitting input files9045 -Node: Static region for typesetting10470 -Node: Lpr format11599 -Node: Controlling which command to invoke12672 -Node: Editing %# notation13265 -Node: Completion13809 -Node: Begin-type completion14369 -Node: Section-type completion17412 -Node: view-sectioning19847 -Node: Large-type completion21427 -Node: Maketitle-type completion22158 -Node: Arbitrary completion22710 -Node: End completion23100 -Node: Accent completion23570 -Node: Image completion24187 -Node: Greek letters completion26444 -Node: Local dictionaries27171 -Node: Commenting out28108 -Node: Cursor jump29567 -Node: Jump to corresponding object29879 -Node: Invoking image processor31280 -Node: Jump to main file32623 -Node: Jumping around the environment32988 -Node: Jumping to last completion position33406 -Node: Changing and Deleting33915 -Node: Changing LaTeX commands34307 -Node: Killing LaTeX commands35484 -Node: Filling36669 -Node: Updation of includeonly38520 -Node: What column39317 -Node: Intelligent newline40402 -Node: Usepackage checker42056 -Node: Online help42647 -Node: Browsing file hierarchy44322 -Node: Cooperation with other packages46059 -Node: Customizations46764 -Node: Lisp variables47098 -Node: All customizable variables48102 -Node: Sample definitions57901 -Node: Hook variables58414 -Node: Hook file59118 -Node: Add-in functions59457 -Node: How the add-in function works60317 -Node: Defining option-add-in62516 -Node: Defining argument-add-in63238 -Node: Defining enclosing-add-in64120 -Node: How the function is called64974 -Node: Useful functions for creating add-in65650 -Node: Contribution67055 -Node: Add-in generator67329 -Node: Etcetera72701 -Node: Copying73306 +Node: Top253 +Node: What is YaTeX?1594 +Node: Main features1967 +Node: Installation3496 +Node: Typesetting4273 +Node: Calling typesetter5403 +Node: Calling previewer7607 +Node: Printing out7968 +Node: %#notation8260 +Node: Changing typesetter8678 +Node: Splitting input files9042 +Node: Static region for typesetting10467 +Node: Lpr format11596 +Node: Controlling which command to invoke12669 +Node: Editing %# notation13339 +Node: Completion13883 +Node: Begin-type completion14443 +Node: Section-type completion17486 +Node: view-sectioning19921 +Node: Large-type completion21501 +Node: Maketitle-type completion22232 +Node: Arbitrary completion22784 +Node: End completion23174 +Node: Accent completion23644 +Node: Image completion24261 +Node: Greek letters completion26518 +Node: Local dictionaries27245 +Node: Commenting out28182 +Node: Cursor jump29641 +Node: Jump to corresponding object29953 +Node: Invoking image processor31354 +Node: Jump to main file32697 +Node: Jumping around the environment33062 +Node: Jumping to last completion position33480 +Node: Changing and Deleting33989 +Node: Changing LaTeX commands34381 +Node: Killing LaTeX commands35558 +Node: Filling36743 +Node: Updation of includeonly38594 +Node: What column39391 +Node: Intelligent newline40476 +Node: Usepackage checker42130 +Node: Online help42721 +Node: Browsing file hierarchy44396 +Node: Cooperation with other packages46133 +Node: Customizations46838 +Node: Lisp variables47172 +Node: All customizable variables48176 +Node: Sample definitions57975 +Node: Hook variables58488 +Node: Hook file59192 +Node: Add-in functions59531 +Node: How the add-in function works60391 +Node: Defining option-add-in62590 +Node: Defining argument-add-in63312 +Node: Defining enclosing-add-in64194 +Node: How the function is called65048 +Node: Useful functions for creating add-in65724 +Node: Contribution67129 +Node: Add-in generator67403 +Node: Etcetera72775 +Node: Copying73380  End tag table diff -r fdbc3b60a09d -r 9cef5d10a0f1 docs/yatexj --- a/docs/yatexj Wed Nov 26 09:41:56 2014 +0900 +++ b/docs/yatexj Tue Dec 16 11:12:38 2014 +0900 @@ -170,8 +170,8 @@ ... 文書を作成する時の漢字コード `dviprint-command-format' ... ファイルの印刷に使われるコマンド列の書式 -`makeindex-command' - ... makeindexコマンド +`YaTeX-dvipdf-command' + ... DVIをPDFに変換するコマンド これらを変更する場合は、やはり`~/.emacs'にて、たとえば(setq tex-command "pdflatex") のようにしてください。どのような値をセットすれば良いかについて @@ -460,6 +460,9 @@ `%#MAKEINDEX' ... bibtexを行なうコマンドライン([prefix] t i) + `%#DVIPDF' + + ... DVIからPDF変換を行なうコマンドライン([prefix] t d) 行頭がこれらのキーワードで始まる行をLaTeX文書の先頭付近に書いておけば、そ れで指定したコマンドを起動できます。 @@ -1636,8 +1639,7 @@ 1=Shift JIS, 2=JIS, 3=EUC, 4=UTF-8 (2 (MS-DOSでは1)) -- Variable: tex-command - LaTeXタイプセッタコマンド名 (`"platex"') - + LaTeXタイプセッタコマンド名 (`"platex"') -- Variable: dvi2-command プレヴューアコマンド名 (`"xdvi -geo +0+0 -s 4"') @@ -1955,109 +1957,131 @@ * :: Greek letter completion. 4. * ;: Image completion. 4. * Σ[しくま]: Image completion. 4. -* 括る[くくる]: Enclose section-type command. 4. -* 括る[くくる]: large型補完. 22. -* 引数[ひきすう]: 2個以上の引数をとる section型コマンド. 4. -* 欧文[おうふん]: Accent mark completion. 4. -* ;自身[;ししん]: Image completion. 32. +* る[くくる]: Enclose section-type command. 4. +* る[くくる]: large型秒 +ョ. 22. +* 引zルひきすう]: 2個以上の引zとる section型コマンド. 4. +* 「6[おうふん]: Accent mark completion. 4. +* ;自艘;ししん]: Image completion. 32. * ∞[むけんたい]: Image completion. 4. -* 矢印[やしるし]: Image completion. 4. -* ブロック[ふろつく]: begin型補完. 81. +* 墨[やしるし]: Image completion. 4. +* ブロック[ふろつく]: begin型秒 +ョ. 81. * ヒストリ[ひすとり]: Cooperation with other packages. 8. -* 桁揃え[けたそろえ]: Filling. 4. +* 桁5ヲ[けたそろえ]: Filling. 4. * やちょう[やちよう]: Intro. 4. * ジャンプ[しやんふ]: view-sectioning. 42. -* &入力[&にゆうりよく]: Intelligent newline. 4. -* 設定例[せつていれい]: Sample definitions. 4. -* 随時補完[すいしほかん]: Arbitrary completion. 4. -* 閉じ込める[としこめる]: begin型補完. 81. -* 再帰補完[さいきほかん]: Recursive completion. 4. -* ユーザ辞書[ゆうさししよ]: begin型補完. 71. -* 論理階層[ろんりかいそう]: view-sectioning. 42. +* &倒ヘ[&にゆうりよく]: Intelligent newline. 4. +* 1阯畆せつていれい]: Sample definitions. 4. +* x-桾b +ョ[すいしほかん]: Arbitrary completion. 4. +* 稗カ込める[としこめる]: begin型秒 +ョ. 81. +* 再帰秒 +ョ[さいきほかん]: Recursive completion. 4. +* ユーザ辞書[艪、さししよ]: begin型秒 +ョ. 71. +* 論Kw[ろんりかいそう]: view-sectioning. 42. * ここはどこ?[ここはとこ?]: What column. 4. -* お絵描きツール起動[おえかきつうるきとう]: お絵描きツール起動. 4. -* 環境の先頭へ[かんきようのせんとうへ]: 環境を単位としたジャンプ. 7. -* 環境の末尾へ[かんきようのまつひへ]: 環境を単位としたジャンプ. 7. -* 環境をマーク[かんきようをまあく]: 環境を単位としたジャンプ. 7. +* おG描ォツール起.[おえかきつうるきとう]: おG描ォツール起.. 4. +* B境の繿ェへ[かんきようのせんとうへ]: B境をハとしたジャンプ. 7. +* B境のへ[かんきようのまつひへ]: B境をハとしたジャンプ. 7. +* B境をマーク[かんきようをまあく]: B境をハとしたジャンプ. 7. * カスタマイズ[かすたまいす]: Customizations. 4. * キーアサイン[きいあさいん]: Customizations. 4. -* 数式モード[すうしきもおと]: Image completion. 4. +* z鍵モード[すうしきもおと]: Image completion. 4. * インストール[いんすとおる]: Installation. 4. * タイプセッタ[たいふせつた]: Invocation. 4. * プレヴューア[ふれひゆうあ]: Invocation. 4. * アウトライン[あうとらいん]: view-sectioning. 4. -* 引数の個数を変える[ひきすうのこすうをかえる]: 2個以上の引数をとる section型コマンド. 24. -* アクセント記号補完[あくせんときこうほかん]: Accent mark completion. 4. -* カスタマイズ変数一覧[かすたまいすへんすういちらん]: All customizable variables. 4. -* 環境名の補完[かんきようめいのほかん]: begin型補完. 4. -* エラー修正[えらあしゆうせい]: Calling typesetter. 4. -* タイプセッタ起動[たいふせつたきとう]: Calling typesetter. 4. +* 引zフ個z桧ヲる[ひきすうのこすうをかえる]: 2個以上の引zとる section型コマンド. 24. +* アクセント記号秒 +ョ[あくせんときこうほかん]: Accent mark completion. 4. +* カスタマイズ桧j覧[かすたまいすへんすういちらん]: All customizable variables. 4. +* B境<フ秒 +ョ[かんきようめいのほかん]: begin型秒 +ョ. 4. +* エラー修額えらあしゆうせい]: Calling typesetter. 4. +* タイプセッタ起.[たいふせつたきとう]: Calling typesetter. 4. * タイプセットエラー[たいふせつとえらあ]: Calling typesetter. 4. -* 環境名の変更[かんきようめいのへんこう]: Changing LaTeX command. 20. -* モード切り替え[もうときりかえ]: Changing mode of YaTeX. 4. -* タイプセッタの使い分け[たいふせつたのつかいわけ]: Changing typesetter. 12. -* 起動するコマンドを変える[きとうするこまんとをかえる]: Changing typesetter. 7. +* B境<フ桧 X[かんきようめいのへんこう]: Changing LaTeX command. 20. +* モード怙闡Vヲ[もうときりかえ]: Changing mode of YaTeX. 4. +* タイプセッタの使い*ッ[たいふせつたのつかいわけ]: Changing typesetter. 12. +* 起.キるコマンドを桧ヲる[きとうするこまんとをかえる]: Changing typesetter. 7. * コメントアウト[こめんとあうと]: Commenting out. 4. -* その他のコマンド制御[そのたのこまんとせいきよ]: Controlling which command to invoke. 4. -* 他パッケージとの連携[たはつけえしとのれんけい]: Cooperation with other packages. 4. +* その<フコマンド+膽そのたのこまんとせいきよ]: Controlling which command to invoke. 4. +* <pッケージとの連 g[たはつけえしとのれんけい]: Cooperation with other packages. 4. * コマンドヒストリ[こまんとひすとり]: Cooperation with other packages. 8. * カーソルジャンプ[かあそるしやんふ]: Cursor jump. 4. -* %#記法自体の編集[%#きほうしたいのへんしゆう]: Editing %# notation. 4. -* パラグラフの桁揃え[はらくらふのけたそろえ]: Filling. 47. -* 領域決定規則[りよういきけつていきそく]: Fix region for typesetting. 25. -* 長いファイルの編集[なかいふあいるのへんしゆう]: Fix region for typesetting. 34. -* 固定領域のタイプセット[こていりよういきのたいふせつと]: Fix region for typesetting. 4. -* ギリシャ文字補完[きりしやもしほかん]: Greek letter completion. 4. -* イメージ補完[いめえしほかん]: Image completion. 4. -* 数式記号イメージ補完[すうしききこういめえしほかん]: Image completion. 4. -* 他のファイルの手直し[ほかのふあいるのてなおし]: Includeonly. 11. -* インクルード構造[いんくるうとこうそう]: Inclusion hierarchy browser. 4. -* おまかせ改行[おまかせかいきよう]: Intelligent newline. 4. +* %#記法ゥ銑フ紐W[%#きほうしたいのへんしゆう]: Editing %# notation. 4. +* パラグラフの桁5ヲ[はらくらふのけたそろえ]: Filling. 47. +* 領域決芍K%[りよういきけつていきそく]: Fix region for typesetting. 25. +* !「ファイルの紐W[なかいふあいるのへんしゆう]: Fix region for typesetting. 34. +* 固苺フ域のタイプセット[こていりよういきのたいふせつと]: Fix region for typesetting. 4. +* ギリシャ6b.[きりしやもしほかん]: Greek letter completion. 4. +* イメージ秒 +ョ[いめえしほかん]: Image completion. 4. +* z鍵記号イメージ秒 +ョ[すうしききこういめえしほかん]: Image completion. 4. +* <フファイルの手死オ[ほかのふあいるのてなおし]: Includeonly. 11. +* インクルード構"[いんくるうとこうそう]: Inclusion hierarchy browser. 4. +* おまかせ行[おまかせかいきよう]: Intelligent newline. 4. * プリントアウト[ふりんとあうと]: Invocation. 4. -* 環境の削除[かんきようのさくしよ]: Killing LaTeX command. 6. -* ラベル自動生成[らへるしとうせいせい]: label-generation. 4. -* フォント指定子[ふおんとしていし]: large型補完. 18. -* 文字サイズ指定子[もしさいすしていし]: large型補完. 18. -* ローカル辞書[ろおかるししよ]: Local dictionary. 4. -* 変更/削除[へんこう/さくしよ]: Modifying/Deleting. 4. +* B境の削充)んきようのさくしよ]: Killing LaTeX command. 6. +* ラベル自.カルらへるしとうせいせい]: label-generation. 4. +* フォント指芟q[ふおんとしていし]: large型秒 +ョ. 18. +* 6Tイズ指芟q[もしさいすしていし]: large型秒 +ョ. 18. +* ローカル辞書[おかるししよ]: Local dictionary. 4. +* 桧 X/削充Vんこう/さくしよ]: Modifying/Deleting. 4. * グローバルヘルプ[くろおはるへるふ]: Online help. 16. * オンラインヘルプ[おんらいんへるふ]: Online help. 4. * キーワード検索[きいわあとけんさく]: Online help. 4. * プライベートヘルプ[ふらいへえとへるふ]: Online help. 16. -* 入力ファイル分割[にゆうりよくふあいるふんかつ]: Splitting input files. 11. -* セクション区切り一覧バッファ[せくしよんくきりいちらんはつふあ]: view-sectioning. 18. -* セクション区切り[せくしよんくきり]: view-sectioning. 42. -* 現在のカラム表示[けんさいのからむひようし]: What column. 23. +* 倒ヘファイル* +Ъにゆうりよくふあいるふんかつ]: Splitting input files. 11. +* セクション区怙闊齬翼oッファ[せくしよんくきりいちらんはつふあ]: view-sectioning. 18. +* セクション区怙鐚せくしよんくきり]: view-sectioning. 42. +* 現在のカラム表ヲ[けんさいのからむひようし]: What column. 23. * apropos: Online help. 4. * autoload: Installation. 4. * auto-mode-alist: Installation. 4. * %#BEGIN: Fix region for typesetting. 4. -* begin型補完[beginかたほかん]: begin型補完. 4. +* begin型秒 +ョ[beginかたほかん]: begin型秒 +ョ. 4. * C-c: Invocation. 4. * Demacs: Intro. 4. * .emacs: Installation. 4. * %#END: Fix region for typesetting. 4. -* end補完[endほかん]: end補完. 4. +* end秒 +ョ[endほかん]: end秒 +ョ. 4. * ghostview: Splitting input files. 16. * gmhist: Cooperation with other packages. 8. -* hook変数[hookへんすう]: Hook variables. 4. +* hook桧納hookへんすう]: Hook variables. 4. * 出力終了ページ[しゆつりよくしゆうりようへえし]: Print out. 9. * includeonly: Includeonly. 4. * Install: Installation. 4. -* itemなどの桁揃え[itemなとのけたそろえ]: Filling. 8. -* 出力開始ページ[しゆつりよくかいしへえし]: Print out. 9. +* itemなどの桁5ヲ[itemなとのけたそろえ]: Filling. 8. +* 出力J始ページ[しゆつりよくかいしへえし]: Print out. 9. * jlatex: Invocation. 4. -* large型補完[largeかたほかん]: large型補完. 4. +* large型秒 +ョ[largeかたほかん]: large型秒 +ョ. 4. * LaTeX: Intro. 4. * leftarrow: Image completion. 4. * lpr format: lpr format. 4. -* lprフォーマットの変更[lprふおおまつとのへんこう]: Editing %# notation. 18. +* lprフォーマットの桧 X[lprふおおまつとのへんこう]: Editing %# notation. 18. * lprふぉーまっと[lprふおおまつと]: lpr format. 4. * lprフォーマット[lprふおおまつと]: lpr format. 4. -* maketitle型補完[maketitleかたほかん]: maketitle型補完. 4. -* M-C-@: 環境を単位としたジャンプ. 7. -* M-C-a: 環境を単位としたジャンプ. 7. -* M-C-e: 環境を単位としたジャンプ. 7. +* maketitle型秒 +ョ[maketitleかたほかん]: maketitle型秒 +ョ. 4. +* M-C-@: B境をハとしたジャンプ. 7. +* M-C-a: B境をハとしたジャンプ. 7. +* M-C-e: B境をハとしたジャンプ. 7. * min-out: Cooperation with other packages. 17. * M-q: Filling. 47. * Mule: Intro. 4. @@ -2072,24 +2096,31 @@ * prefix ?: Online help. 4. * prefix &: What column. 4. * prefix a: Accent mark completion. 4. -* prefix b: begin型補完. 4. +* prefix b: begin型秒 +ョ. 4. * prefix c: Modifying/Deleting. 4. * prefix d: Inclusion hierarchy browser. 4. -* prefix e: end補完. 4. +* prefix e: end秒 +ョ. 4. * prefix g: Cursor jump. 4. * prefix i: Filling. 8. * prefix k: Modifying/Deleting. 4. * prefix key: Invocation. 4. -* prefix l: large型補完. 4. -* prefix m: maketitle型補完. 4. -* prefix s: section型補完. 4. +* prefix l: large型秒 +ョ. 4. +* prefix m: maketitle型秒 +ョ. 4. +* prefix s: section型秒 +ョ. 4. * prefix SPC: Arbitrary completion. 4. * prefix w: Changing mode of YaTeX. 4. -* prefixキー変更[prefixきいへんこう]: Lisp variables. 4. -* ページ確認省略lpr起動[へえしかくにんしようりやくlprきとう]: Print out. 12. -* section型補完[sectionかたほかん]: section型補完. 4. -* 複雑なtabular[ふくさつなtabular]: What column. 4. -* 先回りusepackage[さきまわり]: Usepackage cheker. 4. +* prefixキー桧 X[prefixきいへんこう]: Lisp variables. 4. +* ページm認ネ略lpr起.[へえしかくにんしようりやくlprきとう]: Print out. 12. +* section型秒 +ョ[sectionかたほかん]: section型秒 +ョ. 4. +* !Gなtabular[ふくさつなtabular]: What column. 4. +* 繚りusepackage[さきまわり]: Usepackage cheker. 4. * YaTeX-help-file: Online help. 16. * YaTeX-help-file-private: Online help. 16. * YaTeX-item-regexp: Filling. 20. @@ -2101,68 +2132,69 @@ +  Tag table: -Node: Top257 -Node: Intro1311 -Node: Terminology1614 -Node: Main features2249 -Node: Installation3282 -Node: Invocation4500 -Node: Calling typesetter5319 -Node: Calling previewer6556 -Node: Print out6872 -Node: %#notation7138 -Node: Changing typesetter7566 -Node: Splitting input files7824 -Node: Fix region for typesetting8776 -Node: lpr format9677 -Node: Controlling which command to invoke10486 -Node: Editing %# notation10887 -Node: Completion11344 -Node: begin型補完11817 -Node: section型補完14401 -Node: 2個以上の引数をとる section型コマンド15496 -Node: Enclose section-type command16314 -Node: Recursive completion16551 -Node: view-sectioning16857 -Node: label-generation18053 -Node: large型補完18402 -Node: maketitle型補完18982 -Node: Arbitrary completion19281 -Node: end補完19594 -Node: Accent mark completion19936 -Node: Image completion20361 -Node: Greek letter completion22178 -Node: Local dictionary22638 -Node: Commenting out23243 -Node: Cursor jump24402 -Node: 対応オブジェクトへのジャンプ24639 -Node: お絵描きツール起動25627 -Node: メインファイルへのジャンプ26547 -Node: 環境を単位としたジャンプ26883 -Node: 最後の補完位置へのジャンプ27240 -Node: Modifying/Deleting27477 -Node: Changing LaTeX command27883 -Node: Killing LaTeX command28434 -Node: Filling29305 -Node: Includeonly30634 -Node: What column31195 -Node: Intelligent newline31974 -Node: Usepackage cheker33007 -Node: Changing mode of YaTeX33433 -Node: Online help34009 -Node: Inclusion hierarchy browser34985 -Node: Cooperation with other packages36263 -Node: Customizations36718 -Node: Lisp variables37015 -Node: All customizable variables37622 -Node: Sample definitions44923 -Node: Hook variables45357 -Node: Hook file46251 -Node: Add-in functions46457 -Node: Etc46684 -Node: Copying46968 -Node: Concept Index47599 +Node: Top254 +Node: Intro1308 +Node: Terminology1611 +Node: Main features2246 +Node: Installation3279 +Node: Invocation4503 +Node: Calling typesetter5322 +Node: Calling previewer6559 +Node: Print out6875 +Node: %#notation7141 +Node: Changing typesetter7569 +Node: Splitting input files7827 +Node: Fix region for typesetting8779 +Node: lpr format9680 +Node: Controlling which command to invoke10489 +Node: Editing %# notation10960 +Node: Completion11417 +Node: begin型補完11890 +Node: section型補完14474 +Node: 2個以上の引数をとる section型コマンド15569 +Node: Enclose section-type command16387 +Node: Recursive completion16624 +Node: view-sectioning16930 +Node: label-generation18126 +Node: large型補完18475 +Node: maketitle型補完19055 +Node: Arbitrary completion19354 +Node: end補完19667 +Node: Accent mark completion20009 +Node: Image completion20434 +Node: Greek letter completion22251 +Node: Local dictionary22711 +Node: Commenting out23316 +Node: Cursor jump24475 +Node: 対応オブジェクトへのジャンプ24712 +Node: お絵描きツール起動25700 +Node: メインファイルへのジャンプ26620 +Node: 環境を単位としたジャンプ26956 +Node: 最後の補完位置へのジャンプ27313 +Node: Modifying/Deleting27550 +Node: Changing LaTeX command27956 +Node: Killing LaTeX command28507 +Node: Filling29378 +Node: Includeonly30707 +Node: What column31268 +Node: Intelligent newline32047 +Node: Usepackage cheker33080 +Node: Changing mode of YaTeX33506 +Node: Online help34082 +Node: Inclusion hierarchy browser35058 +Node: Cooperation with other packages36336 +Node: Customizations36791 +Node: Lisp variables37088 +Node: All customizable variables37695 +Node: Sample definitions44996 +Node: Hook variables45430 +Node: Hook file46324 +Node: Add-in functions46530 +Node: Etc46757 +Node: Copying47041 +Node: Concept Index47672  End tag table diff -r fdbc3b60a09d -r 9cef5d10a0f1 makefile --- a/makefile Wed Nov 26 09:41:56 2014 +0900 +++ b/makefile Tue Dec 16 11:12:38 2014 +0900 @@ -49,8 +49,8 @@ # make clean to delete all producted files # make ci to check in all # make co to check out all -MVER = 1.77 -LISP = ${LISP18} ${LISP19} +MVER = 1.78 +LISP = ${LISP18} ${LISP19} ${LISP23} YAHTML = yahtml.el COMMON = yatexlib.el yatexprc.el LISP18 = comment.el yatex.el yatexadd.el yatexgen.el yatexenv.el \ @@ -58,6 +58,7 @@ yatexmth.el yatexhks.el yatexhlp.el \ yatexm-o.el yatexsec.el yatexhie.el yatexpkg.el ${YAHTML} LISP19 = yatex19.el +LISP23 = yatex23.el DOCS = ${DOCSRC} ${DOCOBJ} ${NEWS} NEWS = yatex.new DOCHTML = docs/htmlqa docs/htmlqa.eng docs/yahtmlj.tex docs/yahtmle.tex diff -r fdbc3b60a09d -r 9cef5d10a0f1 yahtml.el --- a/yahtml.el Wed Nov 26 09:41:56 2014 +0900 +++ b/yahtml.el Tue Dec 16 11:12:38 2014 +0900 @@ -1,9 +1,9 @@ ;;; yahtml.el --- Yet Another HTML mode -*- coding: sjis -*- ;;; (c) 1994-2013 by HIROSE Yuuji [yuuji(@)yatex.org] -;;; Last modified Tue Jun 3 09:40:02 2014 on firestorm +;;; Last modified Tue Dec 16 11:11:25 2014 on firestorm ;;; $Id$ -(defconst yahtml-revision-number "1.76" +(defconst yahtml-revision-number "1.77" "Revision number of running yahtml.el") ;;; Commentary: @@ -661,6 +661,12 @@ (font-lock-mode 1) ;;Why should I fontify again??? ;; in yatex-mode, there's no need to refontify... (font-lock-fontify-buffer))))) + ;; +dnd for X11 w/ emacs23+ + (and window-system (featurep 'dnd) + (set (make-local-variable 'dnd-protocol-alist) + (cons (cons "^\\(file\\|https?\\):" 'yahtml-dnd-handler) + dnd-protocol-alist))) + (set-syntax-table yahtml-syntax-table) (use-local-map yahtml-mode-map) (YaTeX-read-user-completion-table) @@ -3128,6 +3134,33 @@ (font-lock-mode -1) ;is stupid, but sure. (font-lock-mode 1)) +;;; +;; Drag-n-Drop +;;; +(defun yahtml-dnd-handler (uri action) + "DnD handler for yahtml mode +Convert image URI to img-src and others to a-href." + (let*((file (dnd-get-local-file-name uri)) + (path (if file (file-relative-name file) uri)) + (case-fold-search t) + (geom "")) + (cond + ((memq action '(copy link move private)) + (cond + ((string-match "\\.\\(jpe?g\\|png\\|gif\\|bmp\\|tiff?\\)$" path) + (if file + (setq geom (yahtml-get-image-info path) + geom (if (car geom) + (apply 'format " width=\"%s\" height=\"%s\"" geom) + ""))) + (insert (format "\"%s\"%s" + path (file-name-nondirectory path) geom))) + + (t (insert (format "" path)) + (forward-char -4)))) + (t (message "No handler for action `%s'" action)))) + action) + (run-hooks 'yahtml-load-hook) (provide 'yahtml) diff -r fdbc3b60a09d -r 9cef5d10a0f1 yatex.el --- a/yatex.el Wed Nov 26 09:41:56 2014 +0900 +++ b/yatex.el Tue Dec 16 11:12:38 2014 +0900 @@ -1,6 +1,6 @@ ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*- ;;; (c)1991-2014 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Sun Sep 21 21:57:39 2014 on firestorm +;;; Last modified Tue Dec 16 10:23:28 2014 on firestorm ;;; $Id$ ;;; The latest version of this software is always available at; ;;; http://www.yatex.org/ @@ -8,7 +8,7 @@ ;;; Code: (require 'comment) (require 'yatexlib) -(defconst YaTeX-revision-number "1.77.3" +(defconst YaTeX-revision-number "1.77.4" "Revision number of running yatex.el") ;---------- Local variables ---------- @@ -690,6 +690,10 @@ local-abbrev-table yatex-mode-abbrev-table) (if (fboundp 'comment-indent-new-line) ;for Emacs21 (setq comment-line-break-function 'YaTeX-comment-line-break)) + ;; +dnd for X11 w/ emacs23+ + (and window-system (featurep 'dnd) (require 'yatex23 nil t) + (set (make-local-variable 'dnd-protocol-alist) + (cons (cons "^file:" 'YaTeX-dnd-handler) dnd-protocol-alist))) (if (and YaTeX-use-font-lock (featurep 'font-lock)) (progn diff -r fdbc3b60a09d -r 9cef5d10a0f1 yatex23.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/yatex23.el Tue Dec 16 11:12:38 2014 +0900 @@ -0,0 +1,36 @@ +;;; yatex23.el --- YaTeX facilities for Emacs 23 or later -*- coding: sjis -*- +;;; (c)2014 by HIROSE Yuuji.[yuuji@yatex.org] +;;; Last modified Tue Dec 16 11:08:10 2014 on firestorm +;;; $Id:$ + +;;; Code: +(defun YaTeX-dnd-handler (uri action) + "DnD handler for yatex-mode +Convert local image URI to \\includegraphcis{} and +.tex file names to \\include{}." + (save-excursion + (YaTeX-visit-main t) + (let*((file (dnd-get-local-file-name uri)) + (path (file-relative-name file)) + (insert-file-directory nil) + (case-fold-search t)) + (cond + ((memq action '(copy link move private)) + (cond + ((string-match "\\.\\(jpe?g\\|png\\|gif\\|bmp\\|tiff?\\|e?ps\\|pdf\\)$" path) + (insert "\\includegraphics" + "{" (YaTeX::includegraphics 1 path t) "}") + (YaTeX-package-auto-usepackage "includegraphics" 'section)) + ((string-match "\\.tex$" path) + (insert "\\include{" path "}")) + )) + (t (message "%s" action)))))) + +(provide 'yatex23) + +; Local variables: +; fill-prefix: ";;; " +; paragraph-start: "^$\\| \\|;;;$" +; paragraph-separate: "^$\\| \\|;;;$" +; coding: sjis +; End: diff -r fdbc3b60a09d -r 9cef5d10a0f1 yatexadd.el --- a/yatexadd.el Wed Nov 26 09:41:56 2014 +0900 +++ b/yatexadd.el Tue Dec 16 11:12:38 2014 +0900 @@ -1,7 +1,7 @@ ;;; yatexadd.el --- YaTeX add-in functions ;;; yatexadd.el rev.20 ;;; (c)1991-2014 by HIROSE Yuuji.[yuuji@yatex.org] -;;; Last modified Sun Sep 21 14:14:59 2014 on firestorm +;;; Last modified Tue Dec 16 09:45:09 2014 on firestorm ;;; $Id$ ;;; Code: @@ -1939,9 +1939,9 @@ str) (substring str (match-beginning 1) (match-end 1))))) -(defun YaTeX::includegraphics (argp) +(defun YaTeX::includegraphics (argp &optional file doclip) "Add-in for \\includegraphics" - (let ((imgfile (YaTeX::include argp "Image File: ")) + (let ((imgfile (or file (YaTeX::include argp "Image File: "))) (case-fold-search t) info bb noupdate needclose c) (and (string-match "\\.\\(jpe?g\\|png\\|gif\\|bmp\\|pdf\\)$" imgfile) (file-exists-p imgfile) @@ -1971,10 +1971,11 @@ (replace-match bb)) (noupdate nil) ((and (match-beginning 1) - (prog2 - (message "Insert `%s'? Y)es N)o C)yes+`clip': " bb) - (memq (setq c (read-char)) '(?y ?Y ?\ ?c ?C)) - (message ""))) + (or doclip + (prog2 + (message "Insert `%s'? Y)es N)o C)yes+`clip': " bb) + (memq (setq c (read-char)) '(?y ?Y ?\ ?c ?C)) + (message "")))) (goto-char (match-end 0)) (message "`bb=' %s" (format