diff --git a/auctex-11.86-dinbrief.dif b/auctex-11.86-dinbrief.dif deleted file mode 100644 index 38fa795..0000000 --- a/auctex-11.86-dinbrief.dif +++ /dev/null @@ -1,330 +0,0 @@ -From 0d7a93744a93e155188e592aad8bcd644da02688 Mon Sep 17 00:00:00 2001 -From: Tassilo Horn -Date: Mon, 25 Feb 2013 14:28:34 +0000 -Subject: * style/dinbrief.el ("dinbrief"): Update dinbrief style. - -(LaTeX-dinbrief-insert): New macro. -(LaTeX-dinbrief-style): New function. -(LaTeX-dinbrief-env-recipient): Rename from -`LaTeX-recipient-hook'. -(LaTeX-dinbrief-sender): New function. -(LaTeX-dinbrief-recipient): New function. -(LaTeX-dinbrief-today): Rename from `LaTeX-today'. ---- -(limited to 'style/dinbrief.el') - -diff --git a/style/dinbrief.el b/style/dinbrief.el -index 6049434..8a20519 100644 ---- a/style/dinbrief.el -+++ b/style/dinbrief.el -@@ -1,93 +1,143 @@ --;;; dinbrief.el - Special code for LaTeX-Style dinbrief. -+;; Copyright (C) 1994, 2013 Free Software Foundation, Inc. - --;; Contributed by Werner Fink --;; Please direct comments to him. -+;; Author: Werner Fink -+;; Maintainer: auctex-devel@gnu.org -+;; Keywords: tex -+ -+;; This file is part of AUCTeX. -+ -+;; AUCTeX is free software; you can redistribute it and/or modify it -+;; under the terms of the GNU General Public License as published by -+;; the Free Software Foundation; either version 3, or (at your option) -+;; any later version. -+ -+;; AUCTeX is distributed in the hope that it will be useful, but -+;; WITHOUT ANY WARRANTY; without even the implied warranty of -+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+;; General Public License for more details. -+ -+;; You should have received a copy of the GNU General Public License -+;; along with AUCTeX; see the file COPYING. If not, write to the Free -+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -+;; 02110-1301, USA. -+ -+;;; dinbrief.el - Special code for LaTeX class dinbrief. - - ;;; Commentary: - --;; LaTeX-Style: dinbrief.sty --;; Server: rusinfo.rus.uni-stuttgart.de --;; Directory: /pub/soft/tex/macros/latex/contrib/letters -+;; LaTeX Class: dinbrief.cls - - ;;; Code: - -+(require 'tex) -+ - (TeX-add-style-hook "dinbrief" - (function - (lambda () -+ (add-hook 'LaTeX-document-style-hook -+ 'LaTeX-dinbrief-style) - (LaTeX-add-environments -- '("letter" LaTeX-recipient-hook)) -+ '("letter" LaTeX-dinbrief-env-recipient) -+ "dinquote") - (TeX-add-symbols -- '("Absender" "Absender: ") -- '("Postvermerk" "Postvermerk: ") -- '("Datum" "Datum: ") -- '("Betreff" "Betreff: ") -- '("Behandlungsvermerk" "Behandlungsvermerk: ") -- '("Verteiler" "Verteiler: ") -- "makelabel" "Retourlabel" -- '("Anlagen" "Anlagen: ") -- '("Fenster" "Fenster \(ja/nein\): ") -- '("Retouradresse" "Retouradresse: ") -+ '("address" "Absender: ") -+ '("postremark" "Postvermerk: ") -+ '("date" "Datum: ") -+ '("subject" "Betreff: ") -+ '("handling" "Behandlungsvermerk: ") -+ '("cc" "Verteiler: ") -+ '("place" "Heutiger Ort: ") -+ "makelabels" -+ "nowindowrules" -+ "windowrules" -+ "nowindowtics" -+ "windowtics" -+ "disabledraftstandard" -+ "enabledraftstandard" -+ "centeraddress" -+ "normaladdress" -+ '("encl" "Anlagen: ") -+ '("backaddress" "Retouradresse: ") - '("signature" "Unterschrift: ") - '("opening" "Anrede: ") -- '("closing" "Schlu\"s: "))))) -+ '("closing" "Schluss: "))))) -+ -+(defmacro LaTeX-dinbrief-insert (&rest args) -+ "Insert text ignoring active markers." -+ `(progn (if (TeX-mark-active) (TeX-deactivate-mark)) -+ (insert ,@args))) - --(defun LaTeX-recipient-hook (environment) -+(defun LaTeX-dinbrief-style () -+ "Insert some useful packages for writing german letters." -+ (save-excursion -+ (goto-char (point-min)) ; insert before \begin{document} -+ (if (re-search-forward ".begin.document." (point-max) t) -+ (beginning-of-line 1)) -+ (open-line 2) -+ (indent-relative-maybe) -+ (LaTeX-dinbrief-insert TeX-esc "usepackage" -+ LaTeX-optop "latin1,utf8" LaTeX-optcl -+ TeX-grop "inputenc" TeX-grcl) -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "usepackage" -+ LaTeX-optop "T1" LaTeX-optcl -+ TeX-grop "fontenc" TeX-grcl) -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "usepackage" -+ TeX-grop "ngerman" TeX-grcl) -+ (TeX-run-style-hooks "inputenc") -+ (TeX-run-style-hooks "fontenc") -+ (TeX-run-style-hooks "ngerman"))) -+ -+(defun LaTeX-dinbrief-env-recipient (environment) - "Insert ENVIRONMENT and prompt for recipient and address." -- (let ((sender (read-string "Absender: " (user-full-name))) -- (recipient (read-string "Empf\"anger: ")) -- (address (read-string "Anschrift: ")) -- (postvermerk (read-string "Postvermerk: ")) -- (date (read-string "Datum: " (LaTeX-today))) -- (betreff (read-string "Betreff: ")) -+ (let ( -+ (sender (LaTeX-dinbrief-sender)) -+ (recipient (read-string "Empfänger: ")) -+ (address (LaTeX-dinbrief-recipient)) -+ (date (read-string "Datum: " (LaTeX-dinbrief-today))) -+ (postremark (read-string "Postvermerk: ")) -+ (fenster (read-string "Fenster \(ja/nein\): ")) - (vermerk (read-string "Behandlungsvermerk: ")) - (verteil (read-string "Verteiler: ")) -- (anlage (read-string "Anlagen: ")) -+ (betreff (read-string "Betreff: ")) - (opening (read-string "Anrede: ")) -- (closing (read-string "Schlu\"s: ")) -- (fenster (read-string "Fenster \(ja/nein\): ")) -+ (closing (read-string "Schluss: ")) - (signature (read-string "Unterschrift: ")) -- ) -+ (anlage (read-string "Anlagen: "))) - -- (if (not (zerop (length sender))) -- (progn -- (insert TeX-esc "Absender" TeX-grop sender TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length postvermerk))) -- (progn -- (insert TeX-esc "Postvermerk" TeX-grop postvermerk TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length betreff))) -- (progn -- (insert TeX-esc "Betreff" TeX-grop betreff TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length vermerk))) -- (progn -- (insert TeX-esc "Behandlungsvermerk" TeX-grop vermerk TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length verteil))) -- (progn -- (insert TeX-esc "Verteiler" TeX-grop verteil TeX-grcl) -- (newline-and-indent))) -- (if (not (zerop (length anlage))) -- (progn -- (insert TeX-esc "Anlagen" TeX-grop anlage TeX-grcl) -- (newline-and-indent))) - (if (string= fenster "ja") - (progn -- (insert TeX-esc "Fenster") -- (let ((retouradr (read-string "Retouradresse: " (user-full-name)))) -+ (LaTeX-dinbrief-insert TeX-esc "enabledraftstandard") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "centeraddress") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "nowindowrules") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "windowtics") -+ (newline-and-indent) -+ (let ((retouradr (read-string "Retouradresse: " sender))) - (newline-and-indent) - (if (not (zerop (length retouradr))) - (progn -- (insert TeX-esc "Retouradresse" TeX-grop retouradr TeX-grcl) -- (newline-and-indent)))))) -+ (if (TeX-mark-active) (TeX-deactivate-mark)) -+ (LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop retouradr TeX-grcl) -+ (newline-and-indent))))) -+ (LaTeX-dinbrief-insert TeX-esc "enabledraftstandard") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "centeraddress") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "nowindowrules") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert TeX-esc "windowtics")) -+ (newline-and-indent) - (if (not (zerop (length signature))) - (progn -- (insert TeX-esc "signature" TeX-grop signature TeX-grcl) -+ (LaTeX-dinbrief-insert TeX-esc "signature" TeX-grop signature TeX-grcl) - (newline-and-indent))) - (if (not (zerop (length date))) - (progn -- (insert TeX-esc "Datum" TeX-grop date TeX-grcl) -+ (LaTeX-dinbrief-insert TeX-esc "date" TeX-grop date TeX-grcl) - (newline-and-indent))) - (newline-and-indent) - -@@ -112,9 +162,30 @@ - (progn - (newline) - (indent-to addr-column)))))))) -- (insert "\n") -+ (LaTeX-dinbrief-insert "\n") - (indent-to indentation)) -- (insert TeX-esc "opening" -+ (if (not (zerop (length postremark))) -+ (progn -+ (LaTeX-dinbrief-insert TeX-esc "postremark" TeX-grop postremark TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length betreff))) -+ (progn -+ (LaTeX-dinbrief-insert TeX-esc "subject" TeX-grop) -+ (LaTeX-dinbrief-insert betreff TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length vermerk))) -+ (progn -+ (LaTeX-dinbrief-insert TeX-esc "handling" TeX-grop vermerk TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length verteil))) -+ (progn -+ (LaTeX-dinbrief-insert TeX-esc "cc" TeX-grop verteil TeX-grcl) -+ (newline-and-indent))) -+ (if (not (zerop (length anlage))) -+ (progn -+ (LaTeX-dinbrief-insert TeX-esc "encl" TeX-grop anlage TeX-grcl) -+ (newline-and-indent))) -+ (LaTeX-dinbrief-insert TeX-esc "opening" - TeX-grop - (if (zerop (length opening)) - (concat TeX-esc " ") -@@ -123,7 +194,7 @@ - - (indent-relative-maybe) - (save-excursion -- (insert "\n" TeX-esc "closing" -+ (LaTeX-dinbrief-insert "\n" TeX-esc "closing" - TeX-grop - (if (zerop (length closing)) - (concat TeX-esc " ") -@@ -131,7 +202,46 @@ - TeX-grcl "\n") - (indent-relative-maybe)))) - --(defun LaTeX-today nil -+(defun LaTeX-dinbrief-sender () -+ "Read and write the senders address." -+ (interactive) -+ (let ((name (read-string "Absender: " (user-full-name))) -+ (str (read-string "Meine Strasse: ")) -+ (ort (read-string "Mein Wohnort: "))) -+ (if (not (zerop (length name))) -+ (progn -+ (goto-char (point-min)) ; insert before \end{document} -+ (if (re-search-forward ".end.document." (point-max) t) -+ (beginning-of-line 1)) -+ (previous-line 1) -+ (LaTeX-dinbrief-insert TeX-esc "address" TeX-grop name) -+ (if (not (zerop (length str))) -+ (progn -+ (LaTeX-dinbrief-insert " " TeX-esc TeX-esc) -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert str))) -+ (if (not (zerop (length ort))) -+ (progn -+ (LaTeX-dinbrief-insert " " TeX-esc "par") -+ (newline-and-indent) -+ (LaTeX-dinbrief-insert ort))) -+ (LaTeX-dinbrief-insert TeX-grcl) -+ (newline-and-indent) -+ (concat name ", " str ", " ort))))) -+ -+(defun LaTeX-dinbrief-recipient () -+ "Read and return the recipient address." -+ (interactive) -+ (let ((str (read-string "Wohnhaft in Strasse: ")) -+ (ort (read-string "Aus der Ortschaft: "))) -+ (if (not (zerop (length str))) -+ (if (not (zerop (length ort))) -+ (concat str " " TeX-esc TeX-esc " " ort) -+ str) -+ (if (not (zerop (length ort))) -+ ort)))) -+ -+(defun LaTeX-dinbrief-today () - "Return a string representing todays date according to flavor." - (interactive) - (let ((ctime-string (current-time-string)) -@@ -152,12 +262,13 @@ - ctime-string) - (let ((year (substring ctime-string (match-beginning 3) (match-end 3))) - (month (substring ctime-string (match-beginning 1) (match-end 1))) -- (day (substring ctime-string (match-beginning 2) (match-end 2)))) -+ (day (substring ctime-string (match-beginning 2) (match-end 2))) -+ (place (read-string "Heutiger Ort: "))) - (if (assoc month month-alist) - (progn - (setq month (cdr (assoc month month-alist))) - (if (> 2 (length day)) - (setq day (concat "0" day))))) -- (format "Stuttgart, den %s. %s %s" day month year)))) -+ (format "%s, den %s. %s %s" place day month year)))) - - ;;; dinbrief.el ends here --- -cgit v0.9.0.2 diff --git a/auctex-11.87.dif b/auctex-11.87.dif deleted file mode 100644 index 45d1f6a..0000000 --- a/auctex-11.87.dif +++ /dev/null @@ -1,32 +0,0 @@ ---- latex.el -+++ latex.el 2006-06-29 18:40:59.000000000 +0200 -@@ -1557,6 +1557,7 @@ ELSE as an argument list." - ","))))) - (if (zerop (length style)) - (setq style LaTeX-default-style)) -+ (TeX-run-style-hooks style) - (if (not (zerop (length options))) - (insert LaTeX-optop options LaTeX-optcl)) - (insert TeX-grop style TeX-grcl)) ---- tex-site.el.in -+++ tex-site.el.in 2006-06-29 18:44:29.000000000 +0200 -@@ -64,6 +64,8 @@ shared by all users of a site." - :group 'TeX-file - :type 'directory) - -+(setq-default TeX-macro-global '("/usr/share/texmf/tex/")) -+ - (defconst TeX-mode-alist - '((tex-mode . tex-mode) - (plain-tex-mode . tex-mode) ---- tex.el -+++ tex.el 2013-06-06 10:47:43.941439046 +0000 -@@ -326,7 +326,7 @@ string." - ;; TeX-print-command. - - (defcustom TeX-print-command -- "{ test -e %s.dvi && %(o?)dvips -P%p %r %s; } || lpr -P%p %o" -+ "{ test -e %s.dvi && %(o?)dvips %r -f %s | lpr -P%p; } || lpr -P%p %o" - "Command used to print a file. - - First `%p' is expanded to the printer name, then ordinary expansion is diff --git a/auctex-11.87.tar.gz b/auctex-11.87.tar.gz deleted file mode 100644 index c38adb5..0000000 --- a/auctex-11.87.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63d57229e585dbf727f5545337615b997488bfdf475274da0718c90b77bd5cf2 -size 1206073 diff --git a/auctex-11.89.tar.gz b/auctex-11.89.tar.gz new file mode 100644 index 0000000..214f666 --- /dev/null +++ b/auctex-11.89.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98af296907b371083289a8b35bd6ff24cfd8fafb013033b724aacb5fe774c9b1 +size 1332904 diff --git a/dvips.patch b/dvips.patch new file mode 100644 index 0000000..8b9f5a7 --- /dev/null +++ b/dvips.patch @@ -0,0 +1,11 @@ +--- tex.el.orig 2015-11-14 12:07:48.063461445 +0200 ++++ tex.el 2015-11-14 12:10:30.386677534 +0200 +@@ -339,7 +339,7 @@ + ;; TeX-print-command. + + (defcustom TeX-print-command +- "{ test -e %s.dvi && %(o?)dvips -P%p %r %s; } || lpr -P%p %o" ++ "{ test -e %s.dvi && %(o?)dvips %r -f %s | lpr -P%p; } || lpr -P%p %o" + "Command used to print a file. + + First `%p' is expanded to the printer name, then ordinary expansion is diff --git a/emacs-auctex.changes b/emacs-auctex.changes index c699bba..7b2b3d4 100644 --- a/emacs-auctex.changes +++ b/emacs-auctex.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Fri Nov 13 19:25:26 UTC 2015 - auxsvr@gmail.com + +- Remove auctex-11.86-dinbrief.dif, as it's been merged upstream, and + everything in auctex-11.87.dif except for the dvips part (now in + dvips.patch). +- Update to 18.89. + * You can now run all commands needed to compile a document and then + open the viewer with a single command: 'TeX-command-run-all', bound + to 'C-c C-a'. + * Commands such as LaTeX and View can now be executed conveniently on + the current section (or part, chapter, subsection, etc). See + 'LaTeX-command-section' and 'LaTeX-command-section-change-level'. + * Forward and backward search with Evince now also work when only a + region of the document is compiled/viewed. + * To open the PDF output file you can now use also PDF Tools, a + document viewer for Emacs. With it, as a plus, forward and + backward search is accurate at word level. + * With new option 'TeX-PDF-via-dvips-ps2pdf' it is possible to + compile a document to DVI and then convert it to PDF using + 'dvips'-'ps2pdf' before viewing it. + * New option 'TeX-file-line-error' allows to select file:line:error + style for error messages. + * Indent '\[...\]' math mode as a regular environment by default. + * Now AUCTeX suggests to run 'makeindex' when appropriate. + * 'TeX-view-program-list' can contain, as third optional element of + each item, the name of the executable(s) needed to open the viewer. + * 'TeX-expand-list' variable has been split into 'TeX-expand-list' + and 'TeX-expand-list-builtin'. Only the former is intended to be + customized by the user, the latter contains built-in expanders. + You might want to keep in 'TeX-expand-list' only new expansion + strings. + * When new option 'TeX-check-engine' is non-nil, before running LaTeX + commands AUCTeX will check whether the correct engine has been set, + based upon known restrictions posed by LaTeX packages. + * Basic support to ConTeXt Mark IV has been added. Users can now + select the Mark version to be used with new option + 'ConTeXt-Mark-version', and AUCTeX is able to catch error messages + in the output log of a Mark IV document. + +------------------------------------------------------------------- +Sun Sep 13 10:50:46 UTC 2015 - auxsvr@gmail.com + +- Update to 11.88 + * 'TeX-PDF-mode' is now enabled. + * 'biblatex' support was greatly expanded. If parsing is enabled, AUCTeX + looks at 'backend' option to decide whether to use Biber or BibTeX. The + 'LaTeX-biblatex-use-Biber' variable was changed to be file local only + and is no more customizable.by default. + * Now you can insert '$...$' or '\(...\)' by typing a single '$'. To do + this, customize the new option 'TeX-electric-math'. + 'TeX-math-close-double-dollar' was removed. + * Brace pairing feature was enhanced in LaTeX documents. Support for + '\bigl', '\Bigl', '\biggl' and '\Biggl', the same as the one for + '\left', was added to 'TeX-insert-macro'. For example, 'C-c bigl + ( ' inserts '\bigl(\bigr)'. + * You can insert brace pair '()', '{}' and '[]' by typing a single left + brace if the new user option 'LaTeX-electric-left-right-brace' is + enabled. + ------------------------------------------------------------------- Tue Oct 7 02:17:49 UTC 2014 - crrodriguez@opensuse.org diff --git a/emacs-auctex.spec b/emacs-auctex.spec index bf6497d..25f4e55 100644 --- a/emacs-auctex.spec +++ b/emacs-auctex.spec @@ -1,7 +1,7 @@ # # spec file for package emacs-auctex # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,15 +35,16 @@ BuildRequires: texlive-collection-latexextra BuildRequires: texlive-tex BuildRequires: texlive-texinfo %endif -Version: 11.87 +Version: 11.89 Release: 0 Summary: AUC TeX: An Emacs Extension License: GPL-2.0+ Group: Productivity/Editors/Emacs -Source: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +Source: http://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz Url: http://www.gnu.org/software/auctex -Patch: auctex-11.87.dif -Patch2: auctex-11.86-dinbrief.dif +# Allows to select printer instance +# PATCH-FEATURE-UPSTREAM dvips.patch +Patch0: dvips.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,8 +67,7 @@ you cannot use this package for XEmacs. %prep %setup -n auctex-%{version} -%patch -%patch2 -p1 +%patch0 %build unset ${!LC_*} @@ -148,10 +148,8 @@ done %doc %{_infodir}/*.info*.gz %{_aucdir}/*.el %{_aucdir}/*.elc -%{_aucdir}/.nosearch %{_aucdir}/auto/*.el %{_aucdir}/images/*.xpm -%{_aucdir}/images/*.xbm %{_aucdir}/style/*.el %{_aucdir}/style/*.elc %{_aucdir}/auto/.nosearch