Browse Source

updated yatex

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6173 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 10 years ago
parent
commit
5849c50aa3
4 changed files with 171 additions and 92 deletions
  1. 14 13
      y/yatex/vine-default-yatex.el
  2. 85 0
      y/yatex/yatex-1.76-vine-vl6.patch
  3. 17 33
      y/yatex/yatex-1.76-vine-vl7.patch
  4. 55 46
      y/yatex/yatex-vl.spec

+ 14 - 13
y/yatex/vine-default-yatex.el

@@ -5,7 +5,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; YaTeX 1.74
+;; YaTeX
 ;;   [La]TeX 入力モード
 ;;   M-x yatex とするか、.tex で終わるファイルを読み込むと起動します
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -22,18 +22,19 @@
       (append 
        '(("\\.\\(tex\\|sty\\|cls\\|fd\\|ind\\|idx\\|ltx\\|clo\\|bbl\\)$" . 
 	  yatex-mode)) auto-mode-alist))
-(setq YaTeX-kanji-code 4               ;; 1: SJIS, 2: JIS, 3: EUC, 4: UTF-8
-      YaTeX-latex-message-code 'utf-8  ;; 文字化けしないようにする
-      ;; YaTeX-no-begend-shortcut t    ;; shortcut ではなく補完を利用
-      YaTeX-use-AMS-LaTeX t
-      YaTeX-use-LaTeX2e t
-      YaTeX-use-font-lock t
-      dvi2-command "pxdvi"  ;; xdvi
-      tex-command "platex -kanji=utf8 -src-specials"
-      dviprint-command-format "dvips %s | lpr"
-      makeindex-command "mendex -U"
-      bibtex-command "pbibtex -kanji=utf8"
-      )
+(setq 
+ ;; YaTeX-kanji-code 4               ;; 1: SJIS, 2: JIS, 3: EUC, 4: UTF-8
+ ;; YaTeX-latex-message-code 'utf-8  ;; 文字化けしないようにする
+ ;; YaTeX-no-begend-shortcut t    ;; shortcut ではなく補完を利用
+ YaTeX-use-AMS-LaTeX t
+ YaTeX-use-LaTeX2e t
+ YaTeX-use-font-lock t
+ ;; dvi2-command "pxdvi"  ;; xdvi
+ ;; tex-command "platex -kanji=utf8 -src-specials"
+ ;; dviprint-command-format "dvips %s | lpr"
+ ;; makeindex-command "mendex -U"
+ ;; bibtex-command "pbibtex -kanji=utf8"
+ )
 
 ;;; TeX-master に関しては safe にする
 ;;; from AUCTeX tex.el 

+ 85 - 0
y/yatex/yatex-1.76-vine-vl6.patch

@@ -0,0 +1,85 @@
+diff -du yatex1.76/yatex.el.vine yatex1.76/yatex.el
+--- yatex1.76/yatex.el.vine	2012-05-11 18:05:40.000000000 +0900
++++ yatex1.76/yatex.el	2012-05-12 13:49:28.412659750 +0900
+@@ -7,6 +7,19 @@
+ ;;; The latest version of this software is always available at;
+ ;;; http://www.yatex.org/
+ 
++;;; Our Vine Linux applied the following settings as default: 
++;; (setq YaTeX-kanji-code 4
++;;       dvi2-command "pxdvi"
++;;       tex-command "eplatex -kanji=utf8 -src-specials"
++;;       dviprint-command-format "pdvips %s | lpr"
++;;       makeindex-command "mendex -U"
++;;       bibtex-command "pbibtex -kanji=utf8"
++;;       )
++;; 
++;; (setq YaTeX-default-document-style
++;;       (concat (if YaTeX-japan "js") "article"))
++
++
+ (require 'comment)
+ (require 'yatexlib)
+ (defconst YaTeX-revision-number "1.76"
+@@ -48,26 +61,26 @@
+ 
+ (defvar tex-command
+   (cond
+-   (YaTeX-use-LaTeX2e "platex")
+-   (YaTeX-japan "jlatex")
++   (YaTeX-use-LaTeX2e "eplatex -kanji=utf8 -src-specials");; default: platex
++   (YaTeX-japan "eplatex -kanji=utf8 -src-specials");; default: jlatex
+    (t "latex"))
+   "*Default command for typesetting LaTeX text.")
+ 
+-(defvar bibtex-command (if YaTeX-japan "jbibtex" "bibtex")
++(defvar bibtex-command (if YaTeX-japan "pbibtex -kanji=utf8" "bibtex");; default: jbibtex
+   "*Default command of BibTeX.")
+ 
+ (defvar dvi2-command		;previewer command for your site
+   (if YaTeX-dos "dviout -wait=0"
+-    "xdvi -geo +0+0 -s 4")
++    "pxdvi");; default: xdvi -geo +0+0 -s 4
+   "*Default previewer command including its option.
+ This default value is for X window system.")
+ 
+-(defvar makeindex-command (if YaTeX-dos "makeind" "makeindex")
++(defvar makeindex-command (if YaTeX-dos "makeind" "mendex -U");; default: makeindex
+   "*Default makeindex command.")
+ 
+ (defvar dviprint-command-format
+   (if YaTeX-dos "dviprt %s %f%t"
+-      "dvi2ps %f %t %s | lpr")
++      "pdvips %s | lpr");; default: dvi2ps %f %t %s | lpr
+   "*Command line string to print out current file.
+ Format string %s will be replaced by the filename.  Do not forget to
+ specify the `from usage' and `to usage' with their option by format string
+@@ -87,7 +100,7 @@
+   "*Command name to convert dvi file to PDF.")
+ 
+ (defvar YaTeX-default-document-style
+-  (concat (if YaTeX-japan "j") "article")
++  (concat (if YaTeX-japan "js") "article");; default: j
+   "*Default LaTeX Documentstyle for YaTeX-typeset-region.")
+ 
+ (defvar YaTeX-need-nonstop nil
+@@ -545,7 +558,7 @@
+   "*Initial tex-section completion")
+ (defvar YaTeX-fontsize-name "large" "*Initial fontsize completion")
+ (defvar YaTeX-single-command "maketitle" "*Initial LaTeX single command")
+-(defvar YaTeX-kanji-code (if YaTeX-dos 1 2)
++(defvar YaTeX-kanji-code (if YaTeX-dos 1 4);; default: 2
+   "*File kanji code used by Japanese TeX.
+ nil: Do not care (Preserve coding-system)
+ 0: no-converion (mule)
+@@ -1909,7 +1922,7 @@
+     ("gimp" . ".jpeg") ("gimp" . ".jpg") ("gimp" . ".png")
+     ("evince" . ".ps")
+     ("evince" . ".eps")
+-    ("ooffice" . ".pdf")
++    ("evince" . ".pdf");; default: ooffice
+     (t . ".tex")
+     (t . ".sty")
+     (t . ""))
+
+Diff finished.  Sat May 12 13:49:41 2012

+ 17 - 33
y/yatex/yatex-1.74-vine-vl7.patch → y/yatex/yatex-1.76-vine-vl7.patch

@@ -1,7 +1,7 @@
-diff -up yatex1.74/yatex.el.vine yatex1.74/yatex.el
---- yatex1.74/yatex.el.vine	2009-09-28 10:57:01.000000000 +0900
-+++ yatex1.74/yatex.el	2011-12-04 00:29:59.894689935 +0900
-@@ -7,6 +7,29 @@
+diff -du yatex1.76/yatex.el.vine yatex1.76/yatex.el
+--- yatex1.76/yatex.el.vine	2012-05-11 18:05:40.000000000 +0900
++++ yatex1.76/yatex.el	2012-05-12 13:49:28.412659750 +0900
+@@ -7,6 +7,19 @@
  ;;; The latest version of this software is always available at;
  ;;; http://www.yatex.org/
  
@@ -16,22 +16,12 @@ diff -up yatex1.74/yatex.el.vine yatex1.74/yatex.el
 +;; 
 +;; (setq YaTeX-default-document-style
 +;;       (concat (if YaTeX-japan "js") "article"))
-+;; 
-+;; (setq YaTeX-file-processor-alist-default
-+;;   '(("tgif" . ".obj")
-+;;     ("evince" . ".ps")
-+;;     ("evince" . ".eps")
-+;;     ("eog" . ".jpg") ("eog" . ".png")
-+;;     ("evince" . ".pdf") ("inkscape" . ".ai")
-+;;     (t . ".tex")
-+;;     (t . ".sty")
-+;;     (t . ""))
-+;;   )
++
 +
  (require 'comment)
  (require 'yatexlib)
- (defconst YaTeX-revision-number "1.74"
-@@ -48,26 +71,26 @@ YaTeX-current-position-register.")
+ (defconst YaTeX-revision-number "1.76"
+@@ -48,26 +61,26 @@
  
  (defvar tex-command
    (cond
@@ -64,8 +54,8 @@ diff -up yatex1.74/yatex.el.vine yatex1.74/yatex.el
    "*Command line string to print out current file.
  Format string %s will be replaced by the filename.  Do not forget to
  specify the `from usage' and `to usage' with their option by format string
-@@ -83,7 +106,7 @@ specify the `from usage' and `to usage' 
-   "*`To' page format of dvi filter.  %e will turn to end page number.")
+@@ -87,7 +100,7 @@
+   "*Command name to convert dvi file to PDF.")
  
  (defvar YaTeX-default-document-style
 -  (concat (if YaTeX-japan "j") "article")
@@ -73,7 +63,7 @@ diff -up yatex1.74/yatex.el.vine yatex1.74/yatex.el
    "*Default LaTeX Documentstyle for YaTeX-typeset-region.")
  
  (defvar YaTeX-need-nonstop nil
-@@ -539,7 +562,7 @@ nil enters both open/close parentheses w
+@@ -545,7 +558,7 @@
    "*Initial tex-section completion")
  (defvar YaTeX-fontsize-name "large" "*Initial fontsize completion")
  (defvar YaTeX-single-command "maketitle" "*Initial LaTeX single command")
@@ -82,20 +72,14 @@ diff -up yatex1.74/yatex.el.vine yatex1.74/yatex.el
    "*File kanji code used by Japanese TeX.
  nil: Do not care (Preserve coding-system)
  0: no-converion (mule)
-@@ -1723,8 +1746,12 @@ See also the documentation of YaTeX-proc
-   
- (defvar YaTeX-file-processor-alist-default
-   '(("tgif" . ".obj")
--    ("ghostview" . ".ps")
--    ("ghostview" . ".eps")
-+    ("evince" . ".ps") ;; default: ghostview
-+    ("evince" . ".eps") ;; default: ghostview
-+    ("eog" . ".jpg")
-+    ("eog" . ".png")
-+    ("evince" . ".pdf")
-+    ("inkscape" . ".ai")
+@@ -1909,7 +1922,7 @@
+     ("gimp" . ".jpeg") ("gimp" . ".jpg") ("gimp" . ".png")
+     ("evince" . ".ps")
+     ("evince" . ".eps")
+-    ("ooffice" . ".pdf")
++    ("evince" . ".pdf");; default: ooffice
      (t . ".tex")
      (t . ".sty")
      (t . ""))
 
-Diff finished.  Sun Dec  4 00:30:03 2011
+Diff finished.  Sat May 12 13:49:41 2012

+ 55 - 46
y/yatex/yatex-vl.spec

@@ -1,33 +1,31 @@
 %define _noVersionedDependencies        1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+#% define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+
+%if %{?_dist_release} <= "vl5"
+exit 1
+%endif
 
 Name:          yatex
-Version:       1.75
-Release:       1%{?_dist_release}
+Version:       1.76
+Release:       1.20120511%{?_dist_release}
 License:       Distributable
-Source0:       http://www.yatex.org/yatex%{version}.tar.gz 
-#Source0:       http://www.yatex.org/yatex10203151806.tar.gz 
+#Source0:       http://www.yatex.org/yatex%{version}.tar.gz 
+Source0:       http://www.gentei.org/~yuuji/tmp/yatex11205111805.tar.gz
 Source1:       %{name}-install.sh
 Source2:       %{name}-remove.sh
 Source3:       %{name}-init.el
 Source4:       vine-default-%{name}.el
 Source5:       vine-default-yahtml.el
 
-## pre-formatted info files here
-Source10:      yatexe
-Source11:      yatexj
-Source12:      yahtmle
-Source13:      yahtmlj
-
 ## Vine Patch(es)
-Patch0:        yatex-info.diff
 Patch1:        yatexhlp-emacs.diff
 Patch2:        yatex-make.diff
 # based on a patch at http://www.nekolinux.2y.net/nekomemo/yahtml01.html
 # and modified to suit 1.70 release
 Patch3:        yahtml-1.70-timestamp.patch
 
-Patch10:       yatex-1.74-vine-vl7.patch
+Patch10:       yatex-1.76-vine-vl7.patch
+Patch11:       yatex-1.76-vine-vl6.patch
 
 URL:           http://www.yatex.org/
 Group:         Applications/Editors/Emacs
@@ -36,10 +34,11 @@ Summary:       YaTeX - Yet Another TeX mode for Emacs
 Summary(ja):   野鳥(YaTeX) - Yet Another TeX mode for Emacs
 BuildArch:     noarch
 
-PreReq:        emacsen
-%prereq_ge     emacsen-common
+Requires(post): emacsen
+Requires(post): emacsen-common
 Requires(post): make
 BuildRequires: emacsen-common
+BuildRequires: nkf perl
 Obsoletes:     yatex-xemacs
 
 Distribution:  Vine Linux
@@ -53,13 +52,9 @@ your efforts of composing LaTeX source on GNU Emacs.
 
 If you are YaTeX user and you install both yatex and auctex on your system, 
 you may add the following configure in your emacs init file 
-%if %{?_dist_release} == "vl5"
-~/.emacs.el: 
-%else
 ~/.emacs.d/emacsXX-vine-default.el (XX: emacs major version): 
-%endif
 
-;; I am YaTeX user!!!
+;; I am a YaTeX user!!!
 (setq vine-default-auctex nil
       vine-default-preview-latex nil)
 
@@ -70,11 +65,7 @@ YaTeX(野鳥)とは、EmacsでLaTeXソースを書くときに生ずる手間を
 
 
 yatex と auctex パッケージの両方をインストールする場合、
-%if %{?_dist_release} == "vl5"
-~/.emacs.el: 
-%else
 ~/.emacs.d/emacsXX-vine-default.el (XX: emacs のメジャーバージョン)
-%endif
 に以下の設定を追加するとよいでしょう。
 
 ;; YaTeX ユーザです!!!
@@ -84,23 +75,29 @@ yatex と auctex パッケージの両方をインストールする場合、
 
 %prep
 %setup -n yatex%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
 %if %{?_dist_release} == "vl7"
 %patch10 -p1 -b .vine
+%elseif %{?_dist_release} == "vl6"
+%patch11 -p1 -b .vine
 %endif
 
-%build
-
 (cd docs
+    # change permissions
     chmod 644 *
-    %__install -v -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
+
+    # encode as utf-8 (LF)
+    # NOTE: This changes needs to entry info files to Info DIR
+    for i in yatexj yatexe yahtmlj yahtmle; do nkf --unix -w --overwrite $i; done
 )
 
 
+%build
+
+
 %install
 
 [ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
@@ -156,15 +153,10 @@ fi
 
 %_emacsenPackageInstall %{name}
 
-
-/sbin/install-info %{_infodir}/yatexe.gz %{_infodir}/dir \
-  --section="Emacs"
-/sbin/install-info %{_infodir}/yatexj.gz %{_infodir}/dir \
-  --section="Emacs"
-/sbin/install-info %{_infodir}/yahtmle.gz %{_infodir}/dir \
-  --section="Emacs"
-/sbin/install-info %{_infodir}/yahtmlj.gz %{_infodir}/dir \
-  --section="Emacs"
+for i in yatexe yatexj yahtmle yahtmlj; do 
+    /sbin/install-info --dir-file %{_infodir}/dir --section="Emacs" \
+    		       %{_infodir}/${i}.gz
+done
 
 
 %preun
@@ -175,14 +167,10 @@ if [ "$1" = 0 ]; then
 
 %_removeemacsenlist %{name}
 
-/sbin/install-info --delete %{_infodir}/yatexe.gz %{_infodir}/dir \
-  --section="Emacs"
-/sbin/install-info --delete %{_infodir}/yatexj.gz %{_infodir}/dir \
-  --section="Emacs"
-/sbin/install-info --delete %{_infodir}/yahtmle.gz %{_infodir}/dir \
-  --section="Emacs"
-/sbin/install-info --delete %{_infodir}/yahtmlj.gz %{_infodir}/dir \
-  --section="Emacs"
+for i in yatexe yatexj yahtmle yahtmlj; do 
+    /sbin/install-info --delete --dir-file %{_infodir}/dir --section="Emacs" \
+    		       %{_infodir}/${i}.gz
+done
 
 fi
 
@@ -193,12 +181,33 @@ fi
 %doc docs
 
 %{_datadir}/emacs/site-lisp/yatex/
-%{_infodir}/*
+%{_infodir}/yahtmle*
+%{_infodir}/yahtmlj*
+%{_infodir}/yatexe*
+%{_infodir}/yatexj*
 %{emacsen_pkgdir}/install/%{name}
 %{emacsen_pkgdir}/remove/%{name}
 
 
 %changelog
+* Sat May 12 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.76-1.20120511
+- source snapshot 20120511: testing version 1.76 development
+- dropped obsoleted/upstreamed patches
+- applied yatex-1.76-vine-vl{6,7}.patch
+
+* Fri May 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.75-3
+- added BuildRequires: nkf perl
+- updated yatex-1.74-vine.patch as yatex-1.75-vine-vl{6,7}.patch
+- dropped pre-formatted info files
+- use original info files
+  - encode info files as utf-8
+  - add INFO-DIR-ENTRY
+
+* Thu May 10 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.75-2
+- fixed vine-default-yatex.el
+- applied yatex-1.74-vine.patch for vl6
+- updated yatex-1.74-vine.patch: support some extensions for \includegraphics
+
 * Thu Feb  9 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.75-1
 - new upstream release
 - updated vine-default-yatex.el