rpm/emacs-auctex
SHA256
1
0
Fork 0
forked from pool/emacs-auctex
Code Pull Requests Activity

Accepting request 1174575 from editors

Browse Source 
- Merge changes from upstream for patch dinbrief.patch 

- Update dinbrief.patch
  * Use babel style direct for ngerman
  * Reintroduce enforced T1 font encoding

- Remove patch ignore-errors.patch
  * After discussion with AUCTeX upstream avoid now those errors
    by ignoring font-lock TeX macros as well as lwarp.sty
- Refresh auctex-13.3-auto-TL-2024.tar.xz with that above

OBS-URL: https://build.opensuse.org/request/show/1174575
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs-auctex?expand=0&rev=48
This commit is contained in:
Ana Guerrero 2024-05-16 15:16:38 +00:00 committed by Git OBS Bridge
commit f7abaec5a8
5 changed files with 95 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auctex-13.3-auto-TL-2024.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:775721294c75e480e3ba191f7181d4477f0e2c7e8b3f56d59faa85d21adad0c6
size 4572516
oid sha256:ebbe400f0e3463ed5c7a0446b9baabc4fe86b4f873a6446abbf48a7491b89552
size 4928620

86
dinbrief.patch
View File

@ -1,14 +1,13 @@
Update dinbrief class
Nowadays UTF-8 is standard, also port the features of the letter class
to dinbrief class.
Signed-off-by: Werner Fink <werner@suse.de>
---
style/dinbrief.el | 45 ++++++++++++++++++++++++++++++++-------------
1 file changed, 32 insertions(+), 13 deletions(-)
style/dinbrief.el | 67 +++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 49 insertions(+), 18 deletions(-)
--- style/dinbrief.el
+++ style/dinbrief.el 2024-05-07 07:10:38.580274545 +0000
+++ style/dinbrief.el
@@ -32,14 +32,26 @@
(require 'tex)
(require 'latex)
@ -22,7 +21,7 @@ to dinbrief class.
+ '("10pt" "11pt" "12pt" "norm" "a4paper" "a5paper" "b5paper"
+ "letterpaper" "legalpaper" "executivepaper" "twoside"
+ "addresshigh" "addressstd" "onecolumn" "twocolumn")
+ "Package options for the letter class.")
+ "Class options for the dinbrief class.")
+
(TeX-add-style-hook
"dinbrief"
@ -38,7 +37,7 @@ to dinbrief class.
(TeX-add-symbols
'("address" "Absender")
'("postremark" "Postvermerk")
@@ -61,7 +73,22 @@
@@ -61,12 +73,28 @@
'("backaddress" "Retouradresse")
'("signature" "Unterschrift")
'("opening" "Anrede")
@ -62,25 +61,71 @@ to dinbrief class.
TeX-dialect)
(defmacro LaTeX-dinbrief-insert (&rest args)
@@ -78,16 +105,8 @@
"Insert text ignoring active markers."
- `(progn (if mark-active (deactivate-mark))
+ `(progn
+ (if (TeX-active-mark) (deactivate-mark))
(insert ,@args)))
(defun LaTeX-dinbrief-style ()
@@ -77,17 +105,14 @@
(beginning-of-line 1))
(open-line 2)
(indent-relative-first-indent-point)
(LaTeX-dinbrief-insert TeX-esc "usepackage"
- (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)
(LaTeX-dinbrief-insert TeX-esc "usepackage"
LaTeX-optop "T1" LaTeX-optcl
TeX-grop "fontenc" TeX-grcl)
- (indent-relative-first-indent-point)
- (LaTeX-dinbrief-insert TeX-esc "usepackage"
TeX-grop "ngerman" TeX-grcl))
+ (newline-and-indent)
(LaTeX-dinbrief-insert TeX-esc "usepackage"
- TeX-grop "ngerman" TeX-grcl))
- (TeX-run-style-hooks "inputenc" "fontenc" "ngerman"))
+ (TeX-run-style-hooks "ngerman"))
+ LaTeX-optop "ngerman" LaTeX-optcl
+ TeX-grop "babel" TeX-grcl))
+ (TeX-run-style-hooks "fontenc" "babel"))
(defun LaTeX-dinbrief-env-recipient (environment)
"Insert ENVIRONMENT and prompt for recipient and address."
@@ -246,7 +265,7 @@
@@ -118,8 +143,10 @@
(newline-and-indent)
(if (not (zerop (length retouradr)))
(progn
- (if mark-active (deactivate-mark))
- (LaTeX-dinbrief-insert TeX-esc "backaddress" TeX-grop retouradr TeX-grcl)
+ (if (TeX-active-mark) (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)
@@ -205,8 +232,8 @@
"Read and write the senders address."
(interactive)
(let ((name (TeX-read-string "Absender: " (user-full-name)))
- (str (TeX-read-string "Meine Strasse: "))
- (ort (TeX-read-string "Mein Wohnort: ")))
+ (str (TeX-read-string "Meine Strasse: "))
+ (ort (TeX-read-string "Mein Wohnort: ")))
(if (not (zerop (length name)))
(progn
(goto-char (point-min)) ; insert before \end{document}
@@ -231,8 +258,8 @@
(defun LaTeX-dinbrief-recipient ()
"Read and return the recipient address."
(interactive)
- (let ((str (TeX-read-string "Wohnhaft in Strasse: "))
- (ort (TeX-read-string "Aus der Ortschaft: ")))
+ (let ((str (TeX-read-string "Wohnhaft in Strasse: "))
+ (ort (TeX-read-string "Aus der Ortschaft: ")))
(if (not (zerop (length str)))
(if (not (zerop (length ort)))
(concat str " " TeX-esc TeX-esc " " ort)
@@ -246,7 +273,7 @@
(let ((ctime-string (current-time-string))
(month-alist '(("Jan" . "Januar")
("Feb" . "Februar")
@ -89,3 +134,12 @@ to dinbrief class.
("Apr" . "April")
("May" . "Mai")
("Jun" . "Juni")
@@ -270,4 +297,8 @@
(setq day (concat "0" day)))))
(format "%s, den %s. %s %s" place day month year))))
+;; Local Variables:
+;; coding: utf-8-unix
+;; End:
+
;;; dinbrief.el ends here

20
emacs-auctex.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu May 16 13:27:12 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Merge changes from upstream for patch dinbrief.patch
-------------------------------------------------------------------
Thu May 16 11:13:22 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Update dinbrief.patch
* Use babel style direct for ngerman
* Reintroduce enforced T1 font encoding
-------------------------------------------------------------------
Thu May 16 09:27:02 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Remove patch ignore-errors.patch
* After discussion with AUCTeX upstream avoid now those errors
by ignoring font-lock TeX macros as well as lwarp.sty
- Refresh auctex-13.3-auto-TL-2024.tar.xz with that above
-------------------------------------------------------------------
Tue May 7 07:38:33 UTC 2024 - Dr. Werner Fink <werner@suse.de>

5
emacs-auctex.spec
View File

@ -56,7 +56,6 @@ URL: https://www.gnu.org/software/auctex
# PATCH-FEATURE-UPSTREAM dvips.patch
Patch0: dvips.patch
Patch1: auctex-13.1-expand.patch
Patch2: ignore-errors.patch
Patch3: initial-reset.patch
Patch4: dinbrief.patch
BuildArch: noarch
@ -83,7 +82,6 @@ you cannot use this package for XEmacs.
%setup -n auctex-%{version}
%patch -P0
%patch -P1
%patch -P2
%patch -P3
%patch -P4
@ -118,8 +116,11 @@ you cannot use this package for XEmacs.
%if %{with tex4auto}
pwd
echo "Run the command TeX-auto-generate-global in mini buffer"
ignore="$(sed -rn '/^\(defcustom TeX-ignore-file/,+1{ s@^\s+@@;s@(\\\\)(\)\$)@\1|lwarp\\.sty\\\\\2@p }' < ../tex.el)"
emacs-gtk -batch -Q -L %{buildroot}%{_sitedir}/auctex \
--eval '(setq TeX-lisp-directory "%{buildroot}%{_aucdir}")' \
--eval "(setq TeX-install-font-lock #'ignore)" \
--eval "(setq TeX-ignore-file ${ignore})" \
--eval '(setq TeX-auto-global "%{buildroot}%{_aucdir}/auto")' \
-l %{buildroot}%{_sitedir}/tex-site.el -f TeX-auto-generate-global
exit 1

48
ignore-errors.patch
View File

@ -1,48 +0,0 @@
---
latex.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- latex.el
+++ latex.el 2024-03-27 10:36:50.635375638 +0000
@@ -2022,7 +2022,7 @@ TYPE is one of the symbols mac or env."
;; over [>=] and a balanced {}
((looking-at-p "[>=]")
(forward-char 1)
- (with-syntax-table syntax (forward-sexp)))
+ (with-syntax-table syntax (ignore-errors (forward-sexp))))
;; Mandatory arguments:
;; m: Ask for input with "Text" as prompt
((looking-at-p "m")
@@ -2038,7 +2038,7 @@ TYPE is one of the symbols mac or env."
;; R<token1><token2>{default}
((looking-at-p "R")
(re-search-forward "R\\(.\\)\\(.\\)" (+ (point) 3) t)
- (with-syntax-table syntax (forward-sexp))
+ (with-syntax-table syntax (ignore-errors (forward-sexp)))
(push `(TeX-arg-string nil nil nil nil
,(match-string-no-properties 1)
,(match-string-no-properties 2))
@@ -2062,12 +2062,12 @@ TYPE is one of the symbols mac or env."
;; O{default}
((looking-at-p "O")
(forward-char 1)
- (with-syntax-table syntax (forward-sexp))
+ (with-syntax-table syntax (ignore-errors (forward-sexp)))
(push (vector "Text") args))
;; D<token1><token2>{default}
((looking-at-p "D")
(re-search-forward "D\\(.\\)\\(.\\)" (+ (point) 3) t)
- (with-syntax-table syntax (forward-sexp))
+ (with-syntax-table syntax (ignore-errors (forward-sexp)))
(push (vector #'TeX-arg-string nil nil nil nil
(match-string-no-properties 1)
(match-string-no-properties 2))
@@ -2099,7 +2099,7 @@ TYPE is one of the symbols mac or env."
,(match-string-no-properties 1))
args)
(when (looking-at-p TeX-grop)
- (with-syntax-table syntax (forward-sexp))))
+ (with-syntax-table syntax (ignore-errors (forward-sexp)))))
;; Finished:
(t nil))))
(if (eq type 'env)