Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: > Arash Esbati writes: > >> I think the same goes for aclocal.m4 and configure.ac? > > Yes. Do you want to take care of them? > Why not? It's fast enough, changes almost never, and when the ELPA > build machine has pdflatex it surely has pdftex, too. Thanks, I installed that change. Let's see how good that works. Best, Arash
main 24d832cd: Create doc/tex-ref.pdf for ELPA releases
branch: main commit 24d832cdd40450a5fcb1cda4e078e06b209a7e3a Author: Arash Esbati Commit: Arash Esbati Create doc/tex-ref.pdf for ELPA releases * GNUmakefile (MAIN_GENERATED_FILES): Add doc/tex-ref.pdf. (doc/tex-ref.pdf): New rule. --- GNUmakefile | 7 +++ 1 file changed, 7 insertions(+) diff --git a/GNUmakefile b/GNUmakefile index 06405960..ad663a56 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,6 +6,7 @@ # tex-site.el # doc: preview-dtxdoc.texi # doc: version.texi +# doc: tex-ref.pdf # latex: prauctex.cfg # latex: prauctex.def # latex: prcounters.def @@ -23,6 +24,7 @@ MAKEINFO=makeinfo INSTALL_INFO=install-info PERL=perl PDFLATEX=pdfla$(TEX) +PDFTEX=pdf$(TEX) MANUALS=auctex preview-latex INFO_FILES=$(MANUALS:=.info) @@ -34,6 +36,7 @@ MAIN_GENERATED_FILES=README \ tex-site.el \ doc/version.texi\ doc/preview-dtxdoc.texi \ + doc/tex-ref.pdf \ $(LATEX_FILES) ALL_GENERATED_FILES=$(MAIN_GENERATED_FILES)\ @@ -132,6 +135,10 @@ ChangeLog: doc/preview-dtxdoc.texi: latex/preview.dtx doc/preview-dtxdoc.pl $(PERL) doc/preview-dtxdoc.pl latex/preview.dtx $@ +# Copied from doc/Makefile.in. +doc/tex-ref.pdf: doc/tex-ref.tex + cd doc && $(PDFTEX) tex-ref.tex && rm tex-ref.log + # Copied from doc/Makefile.in. TEXI_SOURCES:=$(wildcard doc/*.texi) doc/version.texi doc/preview-dtxdoc.texi $(INFO_FILES): %.info: $(TEXI_SOURCES)
Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: > Hm, I think autogen.sh (and doc/Makefile.in called from it) should be > deleted on main. I think the same goes for aclocal.m4 and configure.ac? > However, it still does some stuff which the top-level GNUMakefile is > missing like compiling doc/tex-ref.tex with pdftex. > > Any takers? How about this: --8<---cut here---start->8--- diff --git a/GNUmakefile b/GNUmakefile index 06405960..26970b78 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -23,6 +23,7 @@ MAKEINFO=makeinfo INSTALL_INFO=install-info PERL=perl PDFLATEX=pdfla$(TEX) +PDFTEX=pdf$(TEX) MANUALS=auctex preview-latex INFO_FILES=$(MANUALS:=.info) @@ -132,6 +133,10 @@ ChangeLog: doc/preview-dtxdoc.texi: latex/preview.dtx doc/preview-dtxdoc.pl $(PERL) doc/preview-dtxdoc.pl latex/preview.dtx $@ +# Copied from doc/Makefile.in. +doc/tex-ref.pdf: doc/tex-ref.tex + cd doc && $(PDFTEX) tex-ref.tex && rm tex-ref.log + # Copied from doc/Makefile.in. TEXI_SOURCES:=$(wildcard doc/*.texi) doc/version.texi doc/preview-dtxdoc.texi $(INFO_FILES): %.info: $(TEXI_SOURCES) --8<---cut here---end--->8--- Do you want to have doc/tex-ref.pdf in MAIN_GENERATED_FILES as well? I wasn't sure, so I didn't add it in the change above. Best, Arash
Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: >> , >> | tex-info.el: Warning: the function ‘cl-member’ might not be defined at >> | runtime. > > That's more or less a false positive given that auctex depends on Emacs > 27.1 and cl-member is an autoloaded function there (and even in much > older emacs releases). I'm not sure I follow. I'm running Emacs from master and I see: ,[ C-h f cl-member RET ] | cl-member is an autoloaded native-comp-function in ‘cl-seq.el’. | | (cl-member ITEM LIST [KEYWORD VALUE]...) | | Find the first occurrence of ITEM in LIST. | Return the sublist of LIST whose car is ITEM. | | Keywords supported: :test :test-not :key | | This function has a compiler macro ‘cl--compiler-macro-member’. See | the manual for details. ` And `cl-member' isn't used in AUCTeX, try: $ git grep cl-member What am I missing? >> | In bib-find-next: >> | bib-cite.el:947:8: Warning: ‘find-tag’ is an obsolete function (as of >> 25.1); >> | use ‘xref-find-definitions’ instead. > > If you use bib-cite.el, could you please test if replacing find-tag with > xref-find-definitions actually works? See Keita's answer. This needs a bigger surgery, see bug#53749, which should cure this, sometime. Best, Arash
main b02f3e76: * NEWS.org (Changed): Describe the new repo structure.
branch: main commit b02f3e76d6a9d2acf3e174ceabf341284088391e Author: Arash Esbati Commit: Arash Esbati * NEWS.org (Changed): Describe the new repo structure. --- NEWS.org | 17 + 1 file changed, 17 insertions(+) diff --git a/NEWS.org b/NEWS.org index 2a27df2f..6fcce270 100644 --- a/NEWS.org +++ b/NEWS.org @@ -13,6 +13,23 @@ - Add new support files =style/authblk.el=, =style/ninecolors.el=, =style/supertabular.el=, =style/tabularray.el= and =style/xtab.el=. +** Changed + +- AUCTeX 13.3 marks the last standalone tarball release. From now on, + AUCTeX releases are made available through the + [[https://elpa.gnu.org/packages/auctex.html][Emacs Lisp Package + Archive (ELPA)]]. Distro packagers are encouraged to use the ELPA + packages as-is and install them under one of the new Emacs locations + for system-wide packages, see ~package-directory-list~. + + At the same time, development is now done on the =main= branch and the + =master= branch has been deleted. Its last state has been pushed as + =auctex-13= branch for archiving purposes but it won't get any updates + anymore. + + For users who tracked the master branch: Do =git switch main= to + switch to the main branch where development takes place nowadays. + * [14.0.6] - 2024-06-30 ** Added
main 2b043b61: ; * tex-site.el.in: Pacify the compiler.
branch: main commit 2b043b61bb12a81bbfd17ea72bb7394f41b89a9f Author: Arash Esbati Commit: Arash Esbati ; * tex-site.el.in: Pacify the compiler. --- tex-site.el.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tex-site.el.in b/tex-site.el.in index 2e8b4b50..1d2da038 100644 --- a/tex-site.el.in +++ b/tex-site.el.in @@ -106,6 +106,9 @@ shared by all users of a site." ;; Tell emacs to continue standard unloading procedure. nil) +;; Silence the compiler for the variable defined below: +(defvar TeX-modes) + (defun TeX-modes-set (var value _ignored) "Set VAR (which should be `TeX-modes') to VALUE.
Re: Drop tarball releases and go ELPA only
Uwe Brauer writes: > The following works for me. > > 1. Fresh clone, > >a. .autogen.sh Actually, you can skip 1.a. on main; you can start waiting directly with: >b. make -j (but still wait 3 min) > > 2. (setq load-path (cons (expand-file-name > "~/emacs/site-lisp/packages/src/Auctex/auctex-hg-branches") load-path)) > > 3. (load "auctex-autoloads.el" nil t t) > > And I am back in business > BTW, (using emacs 29.2, still), I obtain. > > , > | tex-info.el: Warning: the function ‘cl-member’ might not be defined at > runtime. > | > | In bib-find-next: > | bib-cite.el:947:8: Warning: ‘find-tag’ is an obsolete function (as > | of 25.1); use ‘xref-find-definitions’ instead. > ` I get them as well, and I don't know where the warning about `cl-member' is coming from. I also get: In TeX-modes-set: tex-site.el:147:43: Warning: reference to free variable ‘TeX-modes’ but this is easy to fix. Best, Arash
Re: GNU AUCTeX is going ELPA-only and the main development branch changed
Uwe Brauer writes: "TH" == Tassilo Horn writes: > > Or clone again , now seriously, if I want to test the latest commits, I > use the main branch, but > > 1. Avoid «make clean» > > 2. Run only «make» but not «make install» > > 3. Or try to fiddle the old Makefile to me needs (on my very own risk) 4. Skip all the above and install AUCTeX from devel-ELPA. Every change in main is transferred to that repo automatically and a new release is triggered[1]; there is a lag of couple of hours, but that should be acceptable. You need something like this in your init file: --8<---cut here---start->8--- (add-to-list 'package-archives '("elpa-devel" . "https://elpa.gnu.org/devel/;) t) (setq package-archive-priority '(("elpa" . 10) ("elpa-devel" . 5))) (setq package-pinned-packages '((auctex . "elpa-devel"))) --8<---cut here---end--->8--- (Maybe you have to run 'M-x package-refresh-contents RET', I didn't test the above). Best, Arash Footnotes: [1] https://elpa.gnu.org/devel/auctex.html
Re: Drop tarball releases and go ELPA only
Uwe Brauer writes: > But this is not relevant if I want to compile the latest commit of the > main branch «in place», right? I'm not sure if I follow: If you want to compile AUCTeX in the repo tree and use it from there, you have to use the from I sent. Or am I missing something? Best, Arash
Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: > Done, master is gone. Thanks, Tassilo. > So now everybody who has a master branch checked out tracking > origin/master, please do > > # Make sure you have the remote auctex-13 branch > git fetch origin > # Rename your local master branch to auctex-13 > git branch -m master auctex-13 > # Make your local auctex-13 branch track upstream auctex-13 > git branch --set-upstream-to=origin/auctex-13 auctex-13 And IIUC loading AUCTeX out of the local repo now only needs: (load "~/development/auctex/auctex-autoloads.el" nil t t) instead of the old: (setq TeX-data-directory "~/development/auctex" TeX-lisp-directory TeX-data-directory) (load "~/development/auctex/auctex.el" nil t t) (load "~/development/auctex/preview-latex.el" nil t t) Best, Arash
Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: > I can rename master to auctex-13 which is actually a deletion of master > and pushing of a new branch auctex-13 which is identical to the old > master. Then everybody who has a checkout of master will have to run > "git branch --set-upstream-to=auctex-13 master" so that his local master > branch tracks auctex-13. Not sure if that's actually needed because > that branch won't get any updates anyway. But it would get rid of the > error on "git pull" that origin/master is gone... One could also do "git branch -m master auctex-13" to track the name change locally before the "--set-upstream-to" part, right? > Will do tomorrow! Thanks, I merged master to main, hopefully for the last time. Best, Arash
main 441a2416: Merge remote-tracking branch 'origin/master'
branch: main commit 441a2416f61a855d76bdcaefb3776cc9e819adea Merge: 9619753f bd74d3cf Author: Arash Esbati Commit: Arash Esbati Merge remote-tracking branch 'origin/master' --- NEWS.org | 4 +- doc/install.texi | 24 +--- latex.el | 10 + style/supertabular.el | 101 ++ style/xtab.el | 78 ++ 5 files changed, 209 insertions(+), 8 deletions(-) diff --git a/NEWS.org b/NEWS.org index 673c7c93..2a27df2f 100644 --- a/NEWS.org +++ b/NEWS.org @@ -10,8 +10,8 @@ ** Added -- Add new support files =style/authblk.el=, =style/ninecolors.el= and - =style/tabularray.el=. +- Add new support files =style/authblk.el=, =style/ninecolors.el=, + =style/supertabular.el=, =style/tabularray.el= and =style/xtab.el=. * [14.0.6] - 2024-06-30 diff --git a/doc/install.texi b/doc/install.texi index 74f5566d..5a00f8c3 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -38,9 +38,6 @@ Once the installation is completed, you can skip the rest of this section and proceed to @ref{Quick Start}. @end ifclear -The remainder of this section is about installing @AUCTeX{} from a -release tarball or from a checkout of the @AUCTeX{} repository. - Installing @AUCTeX{} should be simple: merely @command{./configure}, @command{make}, and @code{make install} for a standard site-wide installation (most other installations can be done by specifying a @@ -381,13 +378,21 @@ redirection. But we recommend not to customize them directly because the customization code for @code{TeX-modes} takes care of some other compatibility issues. -If you want to remove a preinstalled @AUCTeX{} completely before any of -its modes have been used, +When there is a site-wide installation of @AUCTeX{} and you don't want to +use it, you can disable it by +@lisp +(push '(auctex nil) package-load-list) +@end lisp +@noindent +in your early init file (@pxref{Early Init File,,,emacs}) for +@acronym{ELPA} installation, or @lisp (unload-feature 'tex-site) @end lisp @noindent -in your init file should accomplish that. +in your (standard) init file for configure--make installation. (We +recommend those treatments over setting @code{TeX-modes} to @code{nil}, +because they don't leave unused autoloads persisted.) @node Advice for package providers @section Providing @AUCTeX{} as a package @@ -401,6 +406,7 @@ There are people that prefer the built-in Emacs modes for editing @TeX{} files, in particular plain @TeX{} users. There are various ways to tell @AUCTeX{} even after auto-activation that it should not get used, and they are described in +@c FIXME: It doesn't seem that these references discuss this topic. @ifset rawfile the @file{README} file. @end ifset @@ -412,6 +418,12 @@ So if you have users that don't want to use the preinstalled @AUCTeX{}, they can easily get rid of it. Activating @AUCTeX{} by default is therefore a good choice. +First of all, you can install @acronym{ELPA} @AUCTeX{} package under a +directory listed in @code{package-directory-list} to have site-wide +default. + +Next, we discuss configure--make installation. + If the installation procedure did not achieve this already by placing @file{auctex.el} and @file{preview-latex.el} into a possibly existing @file{site-start.d} directory, you can do this by placing diff --git a/latex.el b/latex.el index 7f709a82..66f50485 100644 --- a/latex.el +++ b/latex.el @@ -4168,6 +4168,11 @@ consideration just as is in the non-commented source code." ("drcases" LaTeX-indent-tabular) ("drcases*" LaTeX-indent-tabular) ("cases*"LaTeX-indent-tabular) +;; envs of supertabular.sty +("supertabular"LaTeX-indent-tabular) +("supertabular*" LaTeX-indent-tabular) +("mpsupertabular" LaTeX-indent-tabular) +("mpsupertabular*" LaTeX-indent-tabular) ;; envs of tabularray.sty ("+array" LaTeX-indent-tabular) ("+matrix" LaTeX-indent-tabular) @@ -4177,6 +4182,11 @@ consideration just as is in the non-commented source code." ("+vmatrix" LaTeX-indent-tabular) ("+Vmatrix" LaTeX-indent-tabular) ("+cases" LaTeX-indent-tabular) +;; envs of xtab.sty +("xtabular"LaTeX-indent-tabular) +("xtabular*" LaTeX-indent-tabular) +("mpxtabular" LaTeX-indent-tabular) +("mpxtabular*" LaTeX-indent-tabular) ;; The following should have their own, smart indentation function. ;; Some other day. ("displaymath") diff --git a/style/supertabular.el b/style/supertabular.el new file mode 100644 index ..12a8a057 --- /dev/null +++ b/style/supertabular.el @@ -0,0 +1,101 @@ +;;; supertabular.el --- AUCTeX style for `supertabular.sty' (v4.2c) -*- lexica
main updated (9619753f -> 441a2416)
esbati pushed a change to branch main. from 9619753f * GNUmakefile (README): Fix spacing in generated README. adds be9ffba8 Add new style/supertabular.el adds 16e0a0cc Add new style/xtab.el adds 194df6ed ; * latex.el (LaTeX-indent-environment-list): Fix comment. adds bd74d3cf Update documentation new 441a2416 Merge remote-tracking branch 'origin/master' Summary of changes: NEWS.org | 4 +- doc/install.texi | 24 +--- latex.el | 10 + style/supertabular.el | 101 ++ style/xtab.el | 78 ++ 5 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 style/supertabular.el create mode 100644 style/xtab.el
Re: Some font faces have poor contrast
Tassilo Horn writes: > Very good maintenance effor, Arash! ;-) Thanks, I'm making progress ;-) Best, Arash
Re: Some font faces have poor contrast
Hi Miguel, "Miguel V. S. Frasson" writes: > I will return toolbar-x maintainance. It was a work of 15+ years ago, > so I will take a time to get into it again. Thanks, much obliged, and take your time, there is no rush. Best, Arash
Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: > Arash Esbati writes: > >>> See (info "(emacs) Package Files"): >>> >>>In addition to ‘package-user-dir’, Emacs looks for installed >>> packages in the directories listed in ‘package-directory-list’. >>> These directories are meant for system administrators to make Emacs >>> packages available system-wide; Emacs itself never installs packages >>> there. The package subdirectories for ‘package-directory-list’ are >>> laid out in the same way as in ‘package-user-dir’. >> >> What does the above mean in practical terms? I don't see how one can >> say: Emacs, please install this auctex-from-elpa.tar under >> `package-directory-list'. So a downstream distro manager has to >> install AUCTeX from ELPA locally, and then repack that installation >> and distribute it for pure unpacking in `package-directory-list'? > > Yes, that's what I would assume, too. And that's what packagers already > do, right? The difference is just that previously the package went into > ../site-lisp/auctex/ and the packager had to add code so that the > packages below ../site-lisp/ were added to load-path and now into > ../site-lisp/elpa/auctex/ and the usual ELPA semantics apply. I would > say it's now easier for packagers. IIUC, we have only "YES" answers for switching to ELPA releases and I don't see any reason to wait longer. Tassilo, since you're a more versed Git user than me, do you want to make this change? I.e., rename the current master to 'auctex-13' (or anything else you think fits better) and change the default to main? TIA. Best, Arash
Re: Drop tarball releases and go ELPA only
Hi Keita, Ikumi Keita writes: > The patch for documentation becase like this: > > From 59971bd13345d44632059170eff288c96ed658bc Mon Sep 17 00:00:00 2001 > From: Ikumi Keita > Date: Wed, 10 Jul 2024 19:22:30 +0900 > Subject: [PATCH] Update documentation > > * doc/install.texi (Loading the package): > (Advice for package providers): > Update the way to disable site-wide default so that it includes ELPA > installation. > * doc/install.texi (Installation): Remove a paragraph which became > incorrect. Sorry for the late response. Yes, LGTM, please go ahead and install it. TIA. Best, Arash
main 9619753f: * GNUmakefile (README): Fix spacing in generated README.
branch: main commit 9619753f3d361c649b013e7429190c0254b9dfcb Author: Arash Esbati Commit: Arash Esbati * GNUmakefile (README): Fix spacing in generated README. --- GNUmakefile | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index dd969698..06405960 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -90,11 +90,13 @@ clean: auctex-autoloads.el \ $(DYNVARSFILES) -# Copied from doc/Makefile.in. +# Copied from doc/Makefile.in. The 'echo ""' part fixes the +# spacing above the insertion from preview-readme.texi. MAKEINFO_PLAIN=$(MAKEINFO) -D rawfile --no-headers README: doc/intro.texi doc/preview-readme.texi doc/macros.texi (cd doc; $(MAKEINFO_PLAIN) intro.texi --output -) >$@ - (cd doc; $(MAKEINFO_PLAIN) preview-readme.texi --output -) >> $@ + (cd doc; echo "") >>$@ + (cd doc; $(MAKEINFO_PLAIN) preview-readme.texi --output -) >>$@ # Committer date of HEAD. AUCTEXDATE:=$(shell (git log -n1 --pretty=tformat:"%ci" 2>/dev/null \
Re: Emacs 31 (git@Head) and Auctex (installed via package.el)
"T.V Raman" writes: > I plan to try that later today. I said what I did because I do see > package-quickstart.el pulling in tex-site.el Ok, understood. Curious about the outcome. Best, Arash
Re: Emacs 31 (git@Head) and Auctex (installed via package.el)
"T.V Raman" writes: > So I use package-quickstart to initialize packages, and I suspect > the quickstart file generated by package-quickstart-refresh may be > pulling in tex-site. > > package-quickstart is a nice piee of magic that speeds up package > initialization when you have a lot of packages. I don't use this feature, so I can't tell. Does it mean that you get good results if you rename your `package-quickstart-file', set `package-quickstart' to nil, restart Emacs and open your .tex file? Best, Arash
Re: Emacs 31 (git@Head) and Auctex (installed via package.el)
"T.V Raman" writes: > And with emacs -q -- and after evaluating the form you gave, opening > .tex files puts it in the *right* mode, LaTeX-mode. So the general setup seems to work as expected. > Will dig further in my setup to see what's breaking it -- any tips? Hard to tell. The only thing comes to my mind is that you shouldn't have (require 'tex-site) in your init-file if you install AUCTeX from ELPA. Otherwise, I'm afraid you have to dig in your setup. Best, Arash
Re: Emacs 31 (git@Head) and Auctex (installed via package.el)
"T.V Raman" writes: > 1. Running Emacs 31 build from latest Git @HEAD > 2. auctex "14.0.6" installed via package.el > 3. I have package-initialize in my init and do not do anything else as >recommended by the auctex docs to install. > >When Emacs starts: > >1. (featurep 'tex-site) ==t > >2. tex-mode and latex-mode come from the built-in Emacs tex mode > >3. tex.el from auctex is not yet loaded. > >4. LaTeX docs start off in latex-mode (emacs builtin) -- not the > Auctex LaTeX-mode > >5. It's all very confusing. > > Auctex sanity gets restored if I explicitly call M-x LaTeX-mode > after opening a LaTeX file. Wild guess: What's the value of `TeX-modes' in the setup above? ,[ C-h v TeX-modes RET ] | TeX-modes is a variable defined in ‘tex-site.el’. | | Its value is | (tex-mode plain-tex-mode texinfo-mode latex-mode doctex-mode) | | List of built-in TeX modes redirected to AUCTeX modes. | | This variable can’t be set normally; use customize for that, or | set it with ‘TeX-modes-set’. ` If that variable has sane values, then please do: • emacs -Q • eval: (progn (package-initialize t) (package-activate 'auctex)) and open a .tex file. If that works as expected, your AUCTeX installation should work and we have to look somewhere else. HTH. Best, Arash
master 194df6ed: ; * latex.el (LaTeX-indent-environment-list): Fix comment.
branch: master commit 194df6ed10bdde6c9c575598aaec2a5ee54991c2 Author: Arash Esbati Commit: Arash Esbati ; * latex.el (LaTeX-indent-environment-list): Fix comment. --- latex.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latex.el b/latex.el index 76400178..66f50485 100644 --- a/latex.el +++ b/latex.el @@ -4182,7 +4182,7 @@ consideration just as is in the non-commented source code." ("+vmatrix" LaTeX-indent-tabular) ("+Vmatrix" LaTeX-indent-tabular) ("+cases" LaTeX-indent-tabular) -;; envs of tabularray.sty +;; envs of xtab.sty ("xtabular"LaTeX-indent-tabular) ("xtabular*" LaTeX-indent-tabular) ("mpxtabular" LaTeX-indent-tabular)
master 16e0a0cc 2/2: Add new style/xtab.el
branch: master commit 16e0a0cc499b7f2cb9e9139dce7a6abdba31ea36 Author: Arash Esbati Commit: Arash Esbati Add new style/xtab.el * Makefile.in (STYLESRC): Add new style. * NEWS.org (Added): Announce the new style. * latex.el (LaTeX-indent-environment-list): Add environments provided by the xtab.sty. * style/xtab.el: New file. --- Makefile.in | 2 +- NEWS.org | 2 +- latex.el | 5 style/xtab.el | 78 +++ 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2cb9397a..8c29df7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -201,7 +201,7 @@ STYLESRC = style/prosper.el \ style/changebar.el style/amsrefs.el style/standalone.el \ style/diagbox.el style/contract.el style/enotez.el \ style/authblk.el style/tabularray.el style/ninecolors.el \ - style/supertabular.el + style/xtab.el style/supertabular.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/NEWS.org b/NEWS.org index a8335a22..2a27df2f 100644 --- a/NEWS.org +++ b/NEWS.org @@ -11,7 +11,7 @@ ** Added - Add new support files =style/authblk.el=, =style/ninecolors.el=, - =style/supertabular.el= and =style/tabularray.el=. + =style/supertabular.el=, =style/tabularray.el= and =style/xtab.el=. * [14.0.6] - 2024-06-30 diff --git a/latex.el b/latex.el index e65dbdf9..76400178 100644 --- a/latex.el +++ b/latex.el @@ -4182,6 +4182,11 @@ consideration just as is in the non-commented source code." ("+vmatrix" LaTeX-indent-tabular) ("+Vmatrix" LaTeX-indent-tabular) ("+cases" LaTeX-indent-tabular) +;; envs of tabularray.sty +("xtabular"LaTeX-indent-tabular) +("xtabular*" LaTeX-indent-tabular) +("mpxtabular" LaTeX-indent-tabular) +("mpxtabular*" LaTeX-indent-tabular) ;; The following should have their own, smart indentation function. ;; Some other day. ("displaymath") diff --git a/style/xtab.el b/style/xtab.el new file mode 100644 index ..f05e1c59 --- /dev/null +++ b/style/xtab.el @@ -0,0 +1,78 @@ +;;; xtab.el --- AUCTeX style for `xtab.sty' (v2.3f) -*- lexical-binding: t; -*- + +;; Copyright (C) 2024 Free Software Foundation, Inc. + +;; Author: Arash Esbati +;; Maintainer: auctex-devel@gnu.org +;; Created: 2024-07-21 +;; 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. + +;;; Commentary: + +;; This file adds support for `xtab.sty' (v2.3f) from 2011/07/31. +;; `xtab.sty' is part of TeXLive. + +;;; Code: + +(require 'tex) +(require 'latex) + +;; Silence the compiler: +(declare-function font-latex-add-keywords "font-latex" (keywords class)) + +(TeX-add-style-hook + "xtab" + (lambda () + + ;; Run the style hook for supertabular.el: + (TeX-run-style-hooks "supertabular") + + (TeX-add-symbols +'("tablelasthead" t) +'("notablelasthead" 0) +'("xentrystretch" "Fraction")) + + ;; Add the environments provided by the package: + (LaTeX-add-environments +'("xtabular"LaTeX-env-array) +'("xtabular*" LaTeX-env-array) +'("mpxtabular" LaTeX-env-array) +'("mpxtabular*" LaTeX-env-array)) + + ;; Append the environments to `LaTeX-item-list': + (dolist (env '("xtabular" "mpxtabular")) + (add-to-list 'LaTeX-item-list (cons env 'LaTeX-item-array) t) + (add-to-list 'LaTeX-item-list (cons (concat env "*") 'LaTeX-item-array) t)) + + ;; Fontification + (when (and (featurep 'font-latex) + (eq TeX-install-font-lock 'font-latex-setup)) + (font-latex-add-keywords '(("notablelasthead" "") +("xentrystretch" "{")) + 'function) + (font-latex-add-keywords '(("tablelasthead" "{")) + 'textual))) + TeX-dialect) + +(defvar LaTeX-xtab-package-options + '("errorshow" "pageshow" "debugshow") + "Package options for the xtab package.") + +;;; xtab.el ends here
master be9ffba8 1/2: Add new style/supertabular.el
branch: master commit be9ffba8b310db2a791af41a0a5c3c3f39935e88 Author: Arash Esbati Commit: Arash Esbati Add new style/supertabular.el * Makefile.in (STYLESRC): Add new style. * NEWS.org (Added): Announce the new style. * latex.el (LaTeX-indent-environment-list): Add environments provided by the supertabular.sty. * style/supertabular.el: New file. --- Makefile.in | 3 +- NEWS.org | 4 +- latex.el | 5 +++ style/supertabular.el | 101 ++ 4 files changed, 110 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 671be421..2cb9397a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -200,7 +200,8 @@ STYLESRC = style/prosper.el \ style/wasysym.el style/refcount.el style/simpleicons.el \ style/changebar.el style/amsrefs.el style/standalone.el \ style/diagbox.el style/contract.el style/enotez.el \ - style/authblk.el style/tabularray.el style/ninecolors.el + style/authblk.el style/tabularray.el style/ninecolors.el \ + style/supertabular.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/NEWS.org b/NEWS.org index 673c7c93..a8335a22 100644 --- a/NEWS.org +++ b/NEWS.org @@ -10,8 +10,8 @@ ** Added -- Add new support files =style/authblk.el=, =style/ninecolors.el= and - =style/tabularray.el=. +- Add new support files =style/authblk.el=, =style/ninecolors.el=, + =style/supertabular.el= and =style/tabularray.el=. * [14.0.6] - 2024-06-30 diff --git a/latex.el b/latex.el index 7f709a82..e65dbdf9 100644 --- a/latex.el +++ b/latex.el @@ -4168,6 +4168,11 @@ consideration just as is in the non-commented source code." ("drcases" LaTeX-indent-tabular) ("drcases*" LaTeX-indent-tabular) ("cases*"LaTeX-indent-tabular) +;; envs of supertabular.sty +("supertabular"LaTeX-indent-tabular) +("supertabular*" LaTeX-indent-tabular) +("mpsupertabular" LaTeX-indent-tabular) +("mpsupertabular*" LaTeX-indent-tabular) ;; envs of tabularray.sty ("+array" LaTeX-indent-tabular) ("+matrix" LaTeX-indent-tabular) diff --git a/style/supertabular.el b/style/supertabular.el new file mode 100644 index ..12a8a057 --- /dev/null +++ b/style/supertabular.el @@ -0,0 +1,101 @@ +;;; supertabular.el --- AUCTeX style for `supertabular.sty' (v4.2c) -*- lexical-binding: t; -*- + +;; Copyright (C) 2024 Free Software Foundation, Inc. + +;; Author: Arash Esbati +;; Maintainer: auctex-devel@gnu.org +;; Created: 2024-07-21 +;; 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. + +;;; Commentary: + +;; This file adds support for `supertabular.sty' (v4.2c) from 2024/07/20. +;; `supertabular.sty' is part of TeXLive. + +;;; Code: + +(require 'tex) +(require 'latex) + +;; Silence the compiler: +(declare-function font-latex-add-keywords "font-latex" (keywords class)) + +(defun LaTeX-supertabular-insert-caption (optional prompt) + "Insert the arguments of caption macros provided by supertabular package." + (let* ((caption (TeX-read-string + (TeX-argument-prompt optional prompt "Caption"))) + (short-caption + (if (>= (length caption) LaTeX-short-caption-prompt-length) + (TeX-read-string + (TeX-argument-prompt t nil "Short caption")) +""))) +(TeX-argument-insert short-caption t) +(TeX-argument-insert caption optional) +(when auto-fill-function (LaTeX-fill-paragraph + +(TeX-add-style-hook + "supertabular" + (lambda () + (TeX-add-symbols +'("tablefirsthead" t) +'("tablehead" t) + +'("tabletail" t) +'("tablelasttail" t) + +'("topcaption" LaTeX-supertabular-insert-caption) +'("bottomcaption" LaTeX-supertabular-insert-caption) +'("tablecaption" LaTeX-supertabular-insert-caption) + +'("shrinkheight" (TeX-arg-length "Max. height"))) + + ;; Add the environments provided by the package: +
master updated (922545e8 -> 16e0a0cc)
esbati pushed a change to branch master. from 922545e8 Update style/simpleicons.el to package v13.1.0 new be9ffba8 Add new style/supertabular.el new 16e0a0cc Add new style/xtab.el Summary of changes: Makefile.in | 3 +- NEWS.org | 4 +- latex.el | 10 + style/supertabular.el | 101 ++ style/xtab.el | 78 ++ 5 files changed, 193 insertions(+), 3 deletions(-) create mode 100644 style/supertabular.el create mode 100644 style/xtab.el
main updated (3091f2ca -> 84e95933)
esbati pushed a change to branch main. from 3091f2ca * auctex.el: Shorten 'Commentary' section to 4 lines. adds 7fca4a20 Update style/acro.el to package v3.8 adds 08e7f159 Improve fontification of arguments adds 306a561a Add new style/authblk.el adds 7fcab23c Update style/simpleicons.el to package v13.0.0 adds 89fa93c4 ; * latex.el (TeX-arg-ref): Fix docstring. adds 63087fc4 * style/longtable.el ("longtable"): Support \LTcaptype macro. adds 10c8f782 Keep compatibility with Org mode src editing (bug#71363) adds 01e3e22c ; * doc/changes.texi: Wrap nil in @code and refill paragraphs. adds ba84a2db Add new style/tabularray.el adds 34818c03 Simplify entering of captions in optional argument adds 71d25de1 Add new style/ninecolors.el adds 70422fe0 * style/tabularray.el ("tabularray"): Load ninecolors.el. adds 9bc5d19a ; * NEWS.org: Update the file. adds 922545e8 Update style/simpleicons.el to package v13.1.0 new 84e95933 Merge remote-tracking branch 'origin/master' Summary of changes: NEWS.org | 7 +- doc/changes.texi | 35 +- doc/install.texi | 16 +- font-latex.el| 6 +- latex.el | 66 ++- style/acro.el| 905 +++ style/{ltablex.el => authblk.el} | 50 ++- style/booktabs.el| 18 +- style/listings.el| 43 +- style/longtable.el | 21 +- style/ninecolors.el | 96 + style/simpleicons.el | 81 +--- style/tabularray.el | 474 tests/latex/font-latex-test.el | 17 +- tex-site.el.in | 56 ++- 15 files changed, 1509 insertions(+), 382 deletions(-) copy style/{ltablex.el => authblk.el} (54%) create mode 100755 style/ninecolors.el create mode 100644 style/tabularray.el
main 84e95933: Merge remote-tracking branch 'origin/master'
branch: main commit 84e959333b1790043283520aa34404d3bf86f156 Merge: 3091f2ca 922545e8 Author: Arash Esbati Commit: Arash Esbati Merge remote-tracking branch 'origin/master' --- NEWS.org | 7 +- doc/changes.texi | 35 +- doc/install.texi | 16 +- font-latex.el | 6 +- latex.el | 66 ++- style/acro.el | 905 - style/authblk.el | 73 style/booktabs.el | 18 +- style/listings.el | 43 +- style/longtable.el | 21 +- style/ninecolors.el| 96 + style/simpleicons.el | 81 +--- style/tabularray.el| 474 + tests/latex/font-latex-test.el | 17 +- tex-site.el.in | 56 ++- 15 files changed, 1552 insertions(+), 362 deletions(-) diff --git a/NEWS.org b/NEWS.org index d8ce5658..673c7c93 100644 --- a/NEWS.org +++ b/NEWS.org @@ -8,6 +8,11 @@ * [Unreleased] +** Added + +- Add new support files =style/authblk.el=, =style/ninecolors.el= and + =style/tabularray.el=. + * [14.0.6] - 2024-06-30 ** Added @@ -32,7 +37,7 @@ (~TeX-insert-backslash~). If you need one literal =$=, you can type =C-1 $= or =C-q $=. - We no longer have explicit support of the special behavior that if -~TeX-electric-math~ is non-nil and point is inside math mode right +~TeX-electric-math~ is non-~nil~ and point is inside math mode right between a couple of single dollars, pressing =$= will insert another pair of dollar signs and leave the point between them. diff --git a/doc/changes.texi b/doc/changes.texi index 75cdabe9..496aa799 100644 --- a/doc/changes.texi +++ b/doc/changes.texi @@ -230,11 +230,10 @@ other symbols, in particular @kbd{"} (@code{TeX-insert-quote}) and @kbd{\} (@code{TeX-insert-backslash}). If you need one literal @samp{$}, you can type @kbd{C-1 $} or @kbd{C-q $}. @item -We no longer have explicit support of the special behavior that -if @code{TeX-electric-math} is non-nil and point is inside math -mode right between a couple of single dollars, pressing @kbd{$} -will insert another pair of dollar signs and leave the point -between them. +We no longer have explicit support of the special behavior that if +@code{TeX-electric-math} is non-@code{nil} and point is inside math mode +right between a couple of single dollars, pressing @kbd{$} will insert +another pair of dollar signs and leave the point between them. It still works as before if @code{TeX-electric-math} is pair of dollars while it inserts @samp{\(} and @samp{\)} when @code{TeX-electric-math} is @@ -732,7 +731,7 @@ documented in info files nor turned into a customize option with @item The window system focus is pulled back to Emacs when viewing with evince-compatible viewers if a new customize option -@code{TeX-view-evince-keep-focus} is non-nil. +@code{TeX-view-evince-keep-focus} is non-@code{nil}. @item The usual dose of bug fixes was administered. @@ -1036,12 +1035,12 @@ only new expansion strings. @item Before running commands like @TeX{} and @LaTeX{}, now @AUCTeX{} performs -some checks. If @code{TeX-check-TeX} is non-nil, it will test whether a -working @TeX{} distribution is actually present in the system and -available to Emacs. Instead, when @code{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. +some checks. If @code{TeX-check-TeX} is non-@code{nil}, it will test +whether a working @TeX{} distribution is actually present in the system +and available to Emacs. Instead, when @code{TeX-check-engine} is +non-@code{nil}, before running @LaTeX{} commands @AUCTeX{} will check +whether the correct engine has been set, based upon known restrictions +posed by @LaTeX{} packages. @item Basic support to @ConTeXt{} Mark IV has been added. Users can now @@ -1063,9 +1062,9 @@ Numbers of bugs have been fixed, many minor features have been added. @code{TeX-PDF-mode} is now enabled by default. @item -Now @code{TeX-previous-error} works with @TeX{} commands if the new -option @code{TeX-parse-all-errors} is non-nil, which is the default. -When this option is non-nil, an overview of errors and warnings reported +Now @code{TeX-previous-error} works with @TeX{} commands if the new option +@code{TeX-parse-all-errors} is non-@code{nil}, which is the default. When +this option is non-@code{nil}, an overview of errors and warnings reported by the @TeX{} compiler can be opened with @kbd{M-x TeX-error-overview @key{RET}}. @ifclear rawfile @@ -1097,8 +1096,8 @@ Now you can insert @samp{$...$} or @samp{\(...\)} by typing a single @item @kbd{C-c @key{RET} documentclass @key{RET}} completes with all available @LaTeX{} classes, if the @code{TeX-arg-input-file-search} variable is -no
master 922545e8: Update style/simpleicons.el to package v13.1.0
branch: master commit 922545e8af7f9081a9852387afddbe65a4ebf48c Author: Arash Esbati Commit: Arash Esbati Update style/simpleicons.el to package v13.1.0 * style/simpleicons.el (LaTeX-simpleicons-icons): Update icon names. --- style/simpleicons.el | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/style/simpleicons.el b/style/simpleicons.el index 5fae124b..4a99e344 100644 --- a/style/simpleicons.el +++ b/style/simpleicons.el @@ -1,4 +1,4 @@ -;;; simpleicons.el --- AUCTeX style for `simpleicons.sty' (v13.0.0) -*- lexical-binding: t; -*- +;;; simpleicons.el --- AUCTeX style for `simpleicons.sty' (v13.1.0) -*- lexical-binding: t; -*- ;; Copyright (C) 2023--2024 Free Software Foundation, Inc. @@ -26,8 +26,8 @@ ;;; Commentary: -;; This file adds support for `simpleicons.sty' (v13.0.0) from -;; 2024/07/05. `simpleicons.sty' is part of TeXLive. +;; This file adds support for `simpleicons.sty' (v13.1.0) from +;; 2024/07/12. `simpleicons.sty' is part of TeXLive. ;;; Code: @@ -2125,6 +2125,7 @@ "playstation3" "playstation4" "playstation5" +"playstationportable" "playstationvita" "pleroma" "plesk" @@ -2926,6 +2927,7 @@ "unitedairlines" "unitednations" "unity" +"unjs" "unlicense" "unocss" "unpkg" @@ -3051,6 +3053,7 @@ "webex" "webflow" "webgl" +"webgpu" "weblate" "webmin" "webmoney"
master 9bc5d19a: ; * NEWS.org: Update the file.
branch: master commit 9bc5d19aa5843df1802232bb59007714ae4d6869 Author: Arash Esbati Commit: Arash Esbati ; * NEWS.org: Update the file. --- NEWS.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.org b/NEWS.org index a6572372..673c7c93 100644 --- a/NEWS.org +++ b/NEWS.org @@ -10,7 +10,8 @@ ** Added -- Add new support files =style/authblk.el= and =style/tabularray.el=. +- Add new support files =style/authblk.el=, =style/ninecolors.el= and + =style/tabularray.el=. * [14.0.6] - 2024-06-30
master updated (34818c03 -> 70422fe0)
esbati pushed a change to branch master. from 34818c03 Simplify entering of captions in optional argument new 71d25de1 Add new style/ninecolors.el new 70422fe0 * style/tabularray.el ("tabularray"): Load ninecolors.el. Summary of changes: Makefile.in | 2 +- style/ninecolors.el | 96 + style/tabularray.el | 4 +++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100755 style/ninecolors.el
master 70422fe0 2/2: * style/tabularray.el ("tabularray"): Load ninecolors.el.
branch: master commit 70422fe0c7e283e6bfe69cbb75bd31feb3030f22 Author: Arash Esbati Commit: Arash Esbati * style/tabularray.el ("tabularray"): Load ninecolors.el. --- style/tabularray.el | 4 1 file changed, 4 insertions(+) diff --git a/style/tabularray.el b/style/tabularray.el index 05ef263d..4b5abcff 100644 --- a/style/tabularray.el +++ b/style/tabularray.el @@ -298,6 +298,10 @@ insert line break macro." (LaTeX-tabularray-NewTblrEnviron-cleanup) (LaTeX-tabularray-update-column-letters) + ;; Load ninecolors.el if xcolor.el is loaded: + (when (member "xcolor" (TeX-style-list)) + (TeX-run-style-hooks "ninecolors")) + (TeX-add-symbols ;; 2.6.2 Column Types '("NewColumnType"
master 71d25de1 1/2: Add new style/ninecolors.el
branch: master commit 71d25de1c6ba178d0626bae2e5246b33535bf6f6 Author: Arash Esbati Commit: Arash Esbati Add new style/ninecolors.el * Makefile.in (STYLESRC): Add new style. * style/ninecolors.el: New file. --- Makefile.in | 2 +- style/ninecolors.el | 96 + 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index dc0e95d8..671be421 100644 --- a/Makefile.in +++ b/Makefile.in @@ -200,7 +200,7 @@ STYLESRC = style/prosper.el \ style/wasysym.el style/refcount.el style/simpleicons.el \ style/changebar.el style/amsrefs.el style/standalone.el \ style/diagbox.el style/contract.el style/enotez.el \ - style/authblk.el style/tabularray.el + style/authblk.el style/tabularray.el style/ninecolors.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/style/ninecolors.el b/style/ninecolors.el new file mode 100755 index ..68dbb01c --- /dev/null +++ b/style/ninecolors.el @@ -0,0 +1,96 @@ +;;; ninecolors.el --- AUCTeX style for `ninecolors.sty' (v2022D) -*- lexical-binding: t; -*- + +;; Copyright (C) 2022-2024 Free Software Foundation, Inc. + +;; Author: Arash Esbati +;; Maintainer: auctex-devel@gnu.org +;; Created: 2022-09-13 +;; 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. + +;;; Commentary: + +;; This file adds support for `ninecolors.sty' (v2022D) from +;; 2022/02/13. `ninecolors.sty' is part of TeXLive. + +;;; Code: + +(require 'tex) + +;; Silence the compiler: +(declare-function LaTeX-add-xcolor-definecolors "xcolor" + ( xcolor-definecolors)) +(declare-function font-latex-add-keywords "font-latex" + (keywords class)) + +(defvar LaTeX-ninecolors-colornames + '("gray1""red1" "brown1" "yellow1" "olive1" +"gray2""red2" "brown2" "yellow2" "olive2" +"gray3""red3" "brown3" "yellow3" "olive3" +"gray4""red4" "brown4" "yellow4" "olive4" +"gray5""red5" "brown5" "yellow5" "olive5" +"gray6""red6" "brown6" "yellow6" "olive6" +"gray7""red7" "brown7" "yellow7" "olive7" +"gray8""red8" "brown8" "yellow8" "olive8" +"gray9""red9" "brown9" "yellow9" "olive9" +"green1" "teal1" "cyan1" "azure1" "blue1" +"green2" "teal2" "cyan2" "azure2" "blue2" +"green3" "teal3" "cyan3" "azure3" "blue3" +"green4" "teal4" "cyan4" "azure4" "blue4" +"green5" "teal5" "cyan5" "azure5" "blue5" +"green6" "teal6" "cyan6" "azure6" "blue6" +"green7" "teal7" "cyan7" "azure7" "blue7" +"green8" "teal8" "cyan8" "azure8" "blue8" +"green9" "teal9" "cyan9" "azure9" "blue9" +"violet1" "magenta1" "purple1" +"violet2" "magenta2" "purple2" +"violet3" "magenta3" "purple3" +"violet4" "magenta4" "purple4" +"violet5" "magenta5" "purple5" +"violet6" "magenta6" "purple6" +"violet7" "magenta7" "purple7" +"violet8" "magenta8" "purple8" +"violet9" "magenta9" " purple9") + "List of colors provided by ninecolors package.") + +(TeX-add-style-hook + "ninecolors" + (lambda () + ;; Run the style hook for xcolor.sty: + (TeX-run-style-hooks "xcolor") + + ;; Make the colors defined in ninecolors.sty available: + (apply #'LaTeX-add-xcolor-definecolors LaTeX-ninecolors-colornames) + + ;; Cater for the only macro provided by the package: + (TeX-add-symbols +'("NineColors" + (TeX-arg-key-val (("saturation" ("low" "medium" "high")) + + ;; Fontification + (when (and (featurep 'font-latex) + (eq TeX-install-font-lock 'font-latex-setup)) + (font-latex-add-keywords '(("NineColors" "{")) + 'function))) + TeX-dialect) + +(defvar LaTeX-ninecolors-package-options nil + "Package options for the ninecolors package.") + +;;; ninecolors.el ends here
master updated (01e3e22c -> 34818c03)
esbati pushed a change to branch master. from 01e3e22c ; * doc/changes.texi: Wrap nil in @code and refill paragraphs. new ba84a2db Add new style/tabularray.el new 34818c03 Simplify entering of captions in optional argument Summary of changes: Makefile.in | 2 +- NEWS.org| 6 +- latex.el| 58 ++- style/booktabs.el | 18 +- style/listings.el | 43 + style/tabularray.el | 470 6 files changed, 543 insertions(+), 54 deletions(-) create mode 100644 style/tabularray.el
master 34818c03 2/2: Simplify entering of captions in optional argument
branch: master commit 34818c0307be48d5be323fde1f73c8b9f8cd4980 Author: Arash Esbati Commit: Arash Esbati Simplify entering of captions in optional argument * style/listings.el (LaTeX-listings-reftex-label-context-function): Delete function and use `LaTeX-keyval-caption-reftex-context-function'. (LaTeX-listings-auto-cleanup, "listings"): Allow literal "space" when inserting the optional argument after environments. This should simplify entering a value to the caption key. --- style/listings.el | 43 +-- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/style/listings.el b/style/listings.el index d9352fc7..d8e1dce2 100644 --- a/style/listings.el +++ b/style/listings.el @@ -1,6 +1,6 @@ ;;; listings.el --- AUCTeX style for `listings.sty' -*- lexical-binding: t; -*- -;; Copyright (C) 2004, 2005, 2009, 2013-2022 Free Software Foundation, Inc. +;; Copyright (C) 2004-2024 Free Software Foundation, Inc. ;; Author: Ralf Angeli ;; Maintainer: auctex-devel@gnu.org @@ -322,7 +322,7 @@ (LaTeX-add-environments `(,env LaTeX-env-args -[TeX-arg-key-val (LaTeX-listings-key-val-options)] +[TeX-arg-key-val (LaTeX-listings-key-val-options) nil nil ?\s] (LaTeX-env-label-as-keyval "caption") ,(1- (string-to-number args) (;; mandatory argument(s) only @@ -343,7 +343,7 @@ (when (fboundp 'reftex-add-label-environments) (reftex-add-label-environments `((,env ?l "lst:" "~\\ref{%s}" - LaTeX-listings-reftex-label-context-function + LaTeX-keyval-caption-reftex-context-function (regexp "[Ll]isting") (when (boundp 'reftex-label-regexps) (add-to-list (make-local-variable 'reftex-label-regexps) @@ -367,39 +367,6 @@ (add-hook 'TeX-auto-cleanup-hook #'LaTeX-listings-auto-cleanup t) (add-hook 'TeX-update-style-hook #'TeX-auto-parse t) -(defun LaTeX-listings-reftex-label-context-function (env) - "Extract and return a context string for RefTeX. -The context string is the value given to the caption key. If no -caption key is found, an error is issued." - (let* ((envstart (save-excursion - (re-search-backward (concat "begin{" env "}") - nil t))) - (capt-key (save-excursion - (re-search-backward "caption[ \t\n\r%]*=[ \t\n\r%]*" - envstart t))) - capt-start capt-end) -(if capt-key -(save-excursion - (goto-char capt-key) - (re-search-forward - "caption[ \t\n\r%]*=[ \t\n\r%]*" nil t) - (cond (;; Short caption inside [] is available, extract it only - (looking-at-p (regexp-quote (concat TeX-grop LaTeX-optop))) - (forward-char) - (setq capt-start (1+ (point))) - (setq capt-end (1- (progn (forward-sexp) (point) -;; Extract the entire caption which is enclosed in braces -((looking-at-p TeX-grop) - (setq capt-start (1+ (point))) - (setq capt-end (1- (progn (forward-sexp) (point) -;; Extract everything to next comma , -(t - (setq capt-start (point)) - (setq capt-end (progn (skip-chars-forward "^,") (point) - ;; Return the extracted string - (buffer-substring-no-properties capt-start capt-end)) - (error "No caption found" - (TeX-add-style-hook "listings" (lambda () @@ -439,7 +406,7 @@ caption key is found, an error is issued." ;; New environments (LaTeX-add-environments '("lstlisting" LaTeX-env-args - [TeX-arg-key-val (LaTeX-listings-key-val-options)] + [TeX-arg-key-val (LaTeX-listings-key-val-options) nil nil ?\s] (LaTeX-env-label-as-keyval "caption"))) ;; Append "lstlisting" to `LaTeX-label-alist': @@ -458,7 +425,7 @@ caption key is found, an error is issued." (when (fboundp 'reftex-add-label-environments) (reftex-add-label-environments '(("lstlisting" ?l "lst:" "~\\ref{%s}" - LaTeX-listings-reftex-label-context-function + LaTeX-keyval-caption-reftex-context-function (regexp "[Ll]isting") ;; Fontification
master ba84a2db 1/2: Add new style/tabularray.el
branch: master commit ba84a2dbd143bb5e576eb7013d84a2f2ed619c79 Author: Arash Esbati Commit: Arash Esbati Add new style/tabularray.el * Makefile.in (STYLESRC): Add new style. * NEWS.org (Added): Announce new styles. * latex.el (LaTeX-indent-environment-list): Add environments provided by tabularray.sty. (LaTeX-keyval-caption-reftex-context-function): New function. * style/booktabs.el ("booktabs"): Adjust the arguments of "cmidrule" in case tabularray.el is loaded. * style/tabularray.el: New file. --- Makefile.in | 2 +- NEWS.org| 6 +- latex.el| 58 ++- style/booktabs.el | 18 +- style/tabularray.el | 470 5 files changed, 538 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index d38f7a3d..dc0e95d8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -200,7 +200,7 @@ STYLESRC = style/prosper.el \ style/wasysym.el style/refcount.el style/simpleicons.el \ style/changebar.el style/amsrefs.el style/standalone.el \ style/diagbox.el style/contract.el style/enotez.el \ - style/authblk.el + style/authblk.el style/tabularray.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/NEWS.org b/NEWS.org index d8ce5658..a6572372 100644 --- a/NEWS.org +++ b/NEWS.org @@ -8,6 +8,10 @@ * [Unreleased] +** Added + +- Add new support files =style/authblk.el= and =style/tabularray.el=. + * [14.0.6] - 2024-06-30 ** Added @@ -32,7 +36,7 @@ (~TeX-insert-backslash~). If you need one literal =$=, you can type =C-1 $= or =C-q $=. - We no longer have explicit support of the special behavior that if -~TeX-electric-math~ is non-nil and point is inside math mode right +~TeX-electric-math~ is non-~nil~ and point is inside math mode right between a couple of single dollars, pressing =$= will insert another pair of dollar signs and leave the point between them. diff --git a/latex.el b/latex.el index 9b92c743..7f709a82 100644 --- a/latex.el +++ b/latex.el @@ -4115,15 +4115,15 @@ consideration just as is in the non-commented source code." :type 'regexp) (defcustom LaTeX-indent-environment-list - '(("verbatim" current-indentation) -("verbatim*" current-indentation) -("filecontents" current-indentation) + '(("verbatim" current-indentation) +("verbatim*" current-indentation) +("filecontents" current-indentation) ("filecontents*" current-indentation) -("tabular" LaTeX-indent-tabular) -("tabular*" LaTeX-indent-tabular) -("array" LaTeX-indent-tabular) -("eqnarray" LaTeX-indent-tabular) -("eqnarray*" LaTeX-indent-tabular) +("tabular" LaTeX-indent-tabular) +("tabular*" LaTeX-indent-tabular) +("array" LaTeX-indent-tabular) +("eqnarray" LaTeX-indent-tabular) +("eqnarray*" LaTeX-indent-tabular) ;; envs of amsmath.sty ("align" LaTeX-indent-tabular) ("align*" LaTeX-indent-tabular) @@ -4168,6 +4168,15 @@ consideration just as is in the non-commented source code." ("drcases" LaTeX-indent-tabular) ("drcases*" LaTeX-indent-tabular) ("cases*"LaTeX-indent-tabular) +;; envs of tabularray.sty +("+array" LaTeX-indent-tabular) +("+matrix" LaTeX-indent-tabular) +("+bmatrix" LaTeX-indent-tabular) +("+Bmatrix" LaTeX-indent-tabular) +("+pmatrix" LaTeX-indent-tabular) +("+vmatrix" LaTeX-indent-tabular) +("+Vmatrix" LaTeX-indent-tabular) +("+cases" LaTeX-indent-tabular) ;; The following should have their own, smart indentation function. ;; Some other day. ("displaymath") @@ -9412,6 +9421,39 @@ wrapped in \\(?:...\\)? then." ;; We are done. Just search until the next closing bracket "[^]]*\\]")) +(defun LaTeX-keyval-caption-reftex-context-function (env) + "Extract and return a key=val caption context string for RefTeX in ENV. +ENV is the name of current environment passed to this function by +RefTeX. The context string is the value given to the caption key. If +no caption key is found, an error is issued. See also the docstring of +`reftex-label-alist' and its description for CONTEXT-METHOD." + (let* ((envstart (save-excursion + (re-search-backward (concat "begin{" env "}") + nil t))) + (capt-key (save-excursion + (re-search-backward "\\ ;; Maintainer: auctex-devel@gnu.org @@ -51,11 +
master 01e3e22c: ; * doc/changes.texi: Wrap nil in @code and refill paragraphs.
branch: master commit 01e3e22c7c33c2f6919b88992f47aa02b191196c Author: Arash Esbati Commit: Arash Esbati ; * doc/changes.texi: Wrap nil in @code and refill paragraphs. --- doc/changes.texi | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/doc/changes.texi b/doc/changes.texi index 75cdabe9..496aa799 100644 --- a/doc/changes.texi +++ b/doc/changes.texi @@ -230,11 +230,10 @@ other symbols, in particular @kbd{"} (@code{TeX-insert-quote}) and @kbd{\} (@code{TeX-insert-backslash}). If you need one literal @samp{$}, you can type @kbd{C-1 $} or @kbd{C-q $}. @item -We no longer have explicit support of the special behavior that -if @code{TeX-electric-math} is non-nil and point is inside math -mode right between a couple of single dollars, pressing @kbd{$} -will insert another pair of dollar signs and leave the point -between them. +We no longer have explicit support of the special behavior that if +@code{TeX-electric-math} is non-@code{nil} and point is inside math mode +right between a couple of single dollars, pressing @kbd{$} will insert +another pair of dollar signs and leave the point between them. It still works as before if @code{TeX-electric-math} is pair of dollars while it inserts @samp{\(} and @samp{\)} when @code{TeX-electric-math} is @@ -732,7 +731,7 @@ documented in info files nor turned into a customize option with @item The window system focus is pulled back to Emacs when viewing with evince-compatible viewers if a new customize option -@code{TeX-view-evince-keep-focus} is non-nil. +@code{TeX-view-evince-keep-focus} is non-@code{nil}. @item The usual dose of bug fixes was administered. @@ -1036,12 +1035,12 @@ only new expansion strings. @item Before running commands like @TeX{} and @LaTeX{}, now @AUCTeX{} performs -some checks. If @code{TeX-check-TeX} is non-nil, it will test whether a -working @TeX{} distribution is actually present in the system and -available to Emacs. Instead, when @code{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. +some checks. If @code{TeX-check-TeX} is non-@code{nil}, it will test +whether a working @TeX{} distribution is actually present in the system +and available to Emacs. Instead, when @code{TeX-check-engine} is +non-@code{nil}, before running @LaTeX{} commands @AUCTeX{} will check +whether the correct engine has been set, based upon known restrictions +posed by @LaTeX{} packages. @item Basic support to @ConTeXt{} Mark IV has been added. Users can now @@ -1063,9 +1062,9 @@ Numbers of bugs have been fixed, many minor features have been added. @code{TeX-PDF-mode} is now enabled by default. @item -Now @code{TeX-previous-error} works with @TeX{} commands if the new -option @code{TeX-parse-all-errors} is non-nil, which is the default. -When this option is non-nil, an overview of errors and warnings reported +Now @code{TeX-previous-error} works with @TeX{} commands if the new option +@code{TeX-parse-all-errors} is non-@code{nil}, which is the default. When +this option is non-@code{nil}, an overview of errors and warnings reported by the @TeX{} compiler can be opened with @kbd{M-x TeX-error-overview @key{RET}}. @ifclear rawfile @@ -1097,8 +1096,8 @@ Now you can insert @samp{$...$} or @samp{\(...\)} by typing a single @item @kbd{C-c @key{RET} documentclass @key{RET}} completes with all available @LaTeX{} classes, if the @code{TeX-arg-input-file-search} variable is -non-nil. Completion for class options of the standard @LaTeX{} classes -is provided as well. +non-@code{nil}. Completion for class options of the standard @LaTeX{} +classes is provided as well. @item New user options @code{LaTeX-default-author}, @@ -1420,7 +1419,7 @@ deprecated. @item @AUCTeX{} now can automatically insert a pair of braces after typing @key{_} or @key{^} in math constructs if the new variable -@code{TeX-electric-sub-and-superscript} is set to a non-nil value. +@code{TeX-electric-sub-and-superscript} is set to a non-@code{nil} value. @item Some language-specific support for French was added. There now is
Any tabularray.sty users around?
Hi all, are there people around who use the tabularray package? It is big and has a lot of features. I've never used it and I didn't read the entire manual, but I think I have a working AUCTeX style file for it. Can an actual user give it a try before I install it? The entries for the math environments in `LaTeX-indent-environment-list' are still missing, but that will happen before uploading. Any comments welcome. Best, Arash diff --git a/latex.el b/latex.el index 9b92c743..6d74742d 100644 --- a/latex.el +++ b/latex.el @@ -9412,6 +9412,37 @@ wrapped in \\(?:...\\)? then." ;; We are done. Just search until the next closing bracket "[^]]*\\]")) +(defun LaTeX-keyval-caption-reftex-context-function (env) + "Extract and return a key=val caption context string for RefTeX. +The context string is the value given to the caption key. If no caption +key is found, an error is issued." + (let* ((envstart (save-excursion + (re-search-backward (concat "begin{" env "}") + nil t))) + (capt-key (save-excursion + (re-search-backward "\\ +;; Maintainer: auctex-devel@gnu.org +;; Created: 2024-06-17 +;; 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. + +;;; Commentary: + +;; This file adds support for the tabularray package. + +;;; Code: + +(require 'tex) +(require 'latex) + +;; Silence the compiler: +(declare-function font-latex-add-keywords + "font-latex" + (keywords class)) + +(defvar LaTeX-tabularray-outerspec-key-val + '(("baseline" ("t" "T" "m" "b" "B")) +("long" ("true" "false")) +("tall" ("true" "false")) +("expand" ("\\expanded")) +("t") ("T") ("m") ("b") ("B")) + "Key=value options for the outerspec of tabularray environments.") + +(defun LaTeX-tabularray-outerspec-key-val () + "Return key=value options for the outerspec of tabularray environments." + (append + (when (member (LaTeX-current-environment) '("longtblr" "talltblr")) + (let ((len (mapcar (lambda (x) (concat TeX-esc (car x))) +(LaTeX-length-list + + `(("headsep" ,len) + ("footsep" ,len) + ("presep" ,len) + ("postsep" ,len) + ("theme") + ("caption") + ("entry" ("none")) + ("label" ("none")) + ("note{}") + ("remark{}" + (when (member "functional" (LaTeX-tabularray-used-library)) + '(("evalute"))) + LaTeX-tabularray-outerspec-key-val)) + +(defun LaTeX-tabularray-innerspec-key-val () + "Return key=value options for the innerspec of tabularray environments." + (append + (when (member (LaTeX-current-environment) '("longtblr" "talltblr")) + '(("rowhead") + ("rowfoot"))) + (when (member "functional" (LaTeX-tabularray-used-library)) + '(("process"))) + (let ((len (mapcar (lambda (x) (concat TeX-esc (car x))) + (LaTeX-length-list))) ) + `(("hlines" ("solid" "dashed" "dotted" "text" + "wd" "leftpos" "rightpos" "endpos" "{}{-}{}")) + ("vlines" ("solid" "dashed" "dotted" "text" + "wd" "abovepos" "belowpos" "{odd}{}" "{even}{}")) + ("hline{}" ("solid" "dashed" "dotted" "text" + "wd" "leftpos" "rightpos" "endpos")) + ("vline{}" ("solid" "dashed" "dotted" "text" + "wd" "abovepos" "belowpos" "{odd}{}" "{even}{}" + "{}{}")) + ("hborder{}" ("pagebreak" "abovespace" "belowspace" + "abovespace+" "belowspace+")) + ("vborder{}" ("leftspace" "rightspace" + "leftspace+" "rightspace+")) + + ("cells" ("halign" "l" "c" "r" "j" "valign" "t" "m" "b" "wd" + "bg" "fg" "font" "mode" "$" "$$" "cmd" "preto" "appto")) + ("cell{}{}" ("halign" "l" "c" "r" "j" "valign" "t" "m" "b" "wd" +"bg" "fg" "font" "mode" "$" "$$" "cmd" "preto" "appto")) + + ("rows" ("halign" "l" "c" "r" "j" "valign" "t" "m" "b" "h" "f" +"ht" "bg" "fg" "font" "mode" "$" "$$" "cmd" +"abovesep" "abovesep+" "belowsep" "belowsep+" +"rowsep" "rowsep+" "preto" "appto")) + ("columns" ("halign" "l" "c" "r" "j" "valign" "t" "m"
Re: add git tags to main branch for each ELPA release
Hi Jean-François, jfbu writes: > I have noticed the "main" branch has a number of 14.0.x ELPA releases, > but does not have tags like on master branch for the releases > announced on auctex-announces. > > If it is not too much inconvenient would you consider adding such git > tags? For example it may help for git bisect. Do you think about a git tag -a release_14_x_y on main after every ELPA release? I don't think this is a big deal. What do others think? Best, Arash
Re: Drop tarball releases and go ELPA only
Hi Tassilo, Tassilo Horn writes: > "Dr. Werner Fink" writes: > >> Hmmm, I'm a bit old fashion ... for me the question rises how to get a >> system wide automatically updating installation for a multi user >> workstation from an ELPA channel? > > See (info "(emacs) Package Files"): > >In addition to ‘package-user-dir’, Emacs looks for installed packages > in the directories listed in ‘package-directory-list’. These > directories are meant for system administrators to make Emacs packages > available system-wide; Emacs itself never installs packages there. The > package subdirectories for ‘package-directory-list’ are laid out in the > same way as in ‘package-user-dir’. What does the above mean in practical terms? I don't see how one can say: Emacs, please install this auctex-from-elpa.tar under `package-directory-list'. So a downstream distro manager has to install AUCTeX from ELPA locally, and then repack that installation and distribute it for pure unpacking in `package-directory-list'? Or am I missing something? Best, Arash
Re: Drop tarball releases and go ELPA only
Hi Keita, Ikumi Keita writes: > How about the attached patch? (Maybe I should decouple the commit from > bug#71363. When I first got started with this issue, it was a subsidiary > topic of bug#71363.) This is what I also suggest: let's decouple them. The patch for tex-site.el looks good, AFAICT, so let's install that and close the report. Then we can discuss the manual change. Does this make sense? Best, Arash
Re: Drop tarball releases and go ELPA only
Hi Keita, Ikumi Keita writes: > This kills the element `all' in the initial value of > `package-load-list' and (probably) disables all ELPA packages according > to the paragraph quoted below. I think a suitable code is > (push '(auctex nil) package-load-list) > instead. Yes, you're right, it should have been: (setq package-load-list '((auctex nil) all)) > OK, I'll do some tests and propose a change for the document. Best, Arash
Re: Drop tarball releases and go ELPA only
Hi Keita, Ikumi Keita writes: > I think the cleanest solution is to add '(auctex nil)' to > `package-load-list'. This doesn't register unused autloads for the first > place. (I haven't tested yet, but I suppose that the code needs to be > in early init file, right?) This is also my understanding that `package-load-list' must be set in early init file. I can't find a reference to that in Emacs manuals, though. Maybe I drop Emacs a line about this. > However, I don't have strong preference about it. Same here. > It seems so: > ,[ (elisp) Packaging Basics ] > |Emacs then searches every Lisp file in the content directory for > | autoload magic comments (*note Autoload::). These autoload definitions > | are saved to a file named ‘NAME-autoloads.el’ in the content directory. > | They are typically used to autoload the principal user commands defined > | in the package, but they can also perform other tasks, such as adding an > | element to ‘auto-mode-alist’ (*note Auto Major Mode::). > ` So the general possibilities to de-activate AUCTeX installed from ELPA are: 1) Set `package-load-list' (setq package-load-list '((auctex nil))) in early init file accordingly, or 2) Set in init file (unload-feature 'auctex-autoloads) (unload-feature 'tex-site) Optionally, one can customize `TeX-modes' which applies also to the current installation method. If so, I'd say we can document that in the manual and close the file. Best, Arash
master 63087fc4: * style/longtable.el ("longtable"): Support \LTcaptype macro.
branch: master commit 63087fc4bfd6b24d85077d0b5be2b150e5a37ca9 Author: Arash Esbati Commit: Arash Esbati * style/longtable.el ("longtable"): Support \LTcaptype macro. --- style/longtable.el | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/style/longtable.el b/style/longtable.el index 55384bca..67bab1b1 100644 --- a/style/longtable.el +++ b/style/longtable.el @@ -1,6 +1,6 @@ ;;; longtable.el --- AUCTeX style for `longtable.sty'. -*- lexical-binding: t; -*- -;; Copyright (C) 2013--2022 Free Software Foundation, Inc. +;; Copyright (C) 2013--2024 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Author: Mosè Giordano @@ -117,6 +117,12 @@ insert line break macro." ;; Caption commands '("caption*" 1)) + ;; longtable.sty v4.21 provides the macro \LTcaptype (from + ;; ltcaption.sty) as well. So check here if ltcaption.el is not + ;; loaded before adding the entry as well: + (unless (member "ltcaption" (TeX-style-list)) + (TeX-add-symbols "LTcaptype")) + ;; These parameters are set with \setlength (LaTeX-add-lengths "LTleft" "LTright" "LTpre" "LTpost" "LTcapwidth") @@ -125,12 +131,13 @@ insert line break macro." (LaTeX-add-counters "LTchunksize") ;; Use the enhanced table formatting. Append to - ;; `LaTeX-indent-environment-list' in order not to override custom settings. + ;; `LaTeX-indent-environment-list' in order not to override custom + ;; settings. (add-to-list (make-local-variable 'LaTeX-indent-environment-list) '("longtable" LaTeX-indent-tabular) t) - ;; Append longtable to `LaTeX-label-alist', in order not to override possible - ;; custome values. + ;; Append longtable to `LaTeX-label-alist', in order not to override + ;; possible custome values. (add-to-list 'LaTeX-label-alist '("longtable" . LaTeX-table-label) t) ;; Append longtable to `LaTeX-item-list' with `LaTeX-item-longtable' @@ -139,9 +146,9 @@ insert line break macro." ;; Fontification (when (and (featurep 'font-latex) (eq TeX-install-font-lock 'font-latex-setup)) - ;; Actually, `\caption*{}' macro takes only one mandatory - ;; argument, not an optional one, the following is a workaround - ;; to fontify correctly also the standard `\caption[]{}' macro. + ;; Actually, `\caption*{}' macro takes only one mandatory argument, + ;; not an optional one, the following is a workaround to fontify + ;; correctly also the standard `\caption[]{}' macro. (font-latex-add-keywords '(("caption" "*[{")) 'textual))) TeX-dialect)
Re: [master does not generate the correct AUCTeX version ]
Ikumi Keita writes: > Specify compilation rule for file extension (.el) and don't enumerate > all files to compile. FWIW, I also agree that maintaing STYLESRC isn't really a viable option. Best, Arash
Re: Drop tarball releases and go ELPA only
Hi Keita, Ikumi Keita writes: > When there is a site-wide AUCTeX installation, a user who want to disable > AUCTeX can achieve that by (unload-feature 'tex-site) under > configure installation. But it seems that prescription doesn't work > for site-wide ELPA AUCTeX installation; emacs refuses to unload > `tex-site' saying: > , > | unload-feature: Loaded libraries ("c:/Program > | > Files/Emacs/emacs-29.2/share/emacs/site-lisp/elpa/auctex-14.0.6/auctex-autoloads.el") > | depend on c:/Program > | Files/Emacs/emacs-29.2/share/emacs/site-lisp/elpa/auctex-14.0.6/tex-site.elc > ` Thanks for raising this issue. IIUC this is due this line of code in tex-site.el.in: --8<---cut here---start->8--- ;;; Ensure that loading the autoloads file also loads this file. ;;;###autoload (require 'tex-site) --8<---cut here---end--->8--- So this effect isn't limited to a site-wide installation, but to every ELPA installation? > Should we arrange the main branch so that (unload-feature 'tex-site) > works for site-wide ELPA AUCTeX installation as documented? Or should we > announce other way? (To cusomize `TeX-modes' to nil? To add '(auctex > nil)' to `package-load-list'? Or something else? Do you have any suggestion how to fix this? > Maybe to have both (unload-feature 'autex-autoloads') and > (unload-feature 'tex-site) ?) This seems to be easiest way; I suspect the (unload-feature '-autoloads) applies to every package installed from ELPA? Best, Arash
master 89fa93c4: ; * latex.el (TeX-arg-ref): Fix docstring.
branch: master commit 89fa93c4f9cc9616925f2401e0bbb8b04505e017 Author: Arash Esbati Commit: Arash Esbati ; * latex.el (TeX-arg-ref): Fix docstring. --- latex.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/latex.el b/latex.el index b9014668..9b92c743 100644 --- a/latex.el +++ b/latex.el @@ -2399,11 +2399,11 @@ initial input for the label." (defvar reftex-ref-macro-prompt) (defun TeX-arg-ref (optional prompt definition) - "Let-bind `reftex-ref-macro-prompt' to nil and pass arguments -to `TeX-arg-label'. + "Let-bind `reftex-ref-macro-prompt' to nil and call `TeX-arg-label'. -See the documentation of `TeX-arg-label' for details on the -arguments: OPTIONAL, PROMPT, and DEFINITION." +All arguments are passed to `TeX-arg-label'. See the documentation of +`TeX-arg-label' for details on the arguments: OPTIONAL, PROMPT, and +DEFINITION." (let ((reftex-ref-macro-prompt nil)) (TeX-arg-label optional prompt definition)))
master 7fcab23c: Update style/simpleicons.el to package v13.0.0
branch: master commit 7fcab23c4b8e7806f28798955e7ddd81f34aa759 Author: Arash Esbati Commit: Arash Esbati Update style/simpleicons.el to package v13.0.0 * style/simpleicons.el (LaTeX-simpleicons-icons): Update icon names. --- style/simpleicons.el | 78 +++- 1 file changed, 10 insertions(+), 68 deletions(-) diff --git a/style/simpleicons.el b/style/simpleicons.el index f04d2e15..5fae124b 100644 --- a/style/simpleicons.el +++ b/style/simpleicons.el @@ -1,4 +1,4 @@ -;;; simpleicons.el --- AUCTeX style for `simpleicons.sty' (v12.4.0) -*- lexical-binding: t; -*- +;;; simpleicons.el --- AUCTeX style for `simpleicons.sty' (v13.0.0) -*- lexical-binding: t; -*- ;; Copyright (C) 2023--2024 Free Software Foundation, Inc. @@ -26,8 +26,8 @@ ;;; Commentary: -;; This file adds support for `simpleicons.sty' (v12.4.0) from -;; 2024/06/28. `simpleicons.sty' is part of TeXLive. +;; This file adds support for `simpleicons.sty' (v13.0.0) from +;; 2024/07/05. `simpleicons.sty' is part of TeXLive. ;;; Code: @@ -341,11 +341,6 @@ "awssecretsmanager" "awwwards" "axios" -"azureartifacts" -"azuredataexplorer" -"azuredevops" -"azurefunctions" -"azurepipelines" "babel" "babelio" "babylondotjs" @@ -551,6 +546,7 @@ "chocolatey" "chromatic" "chromecast" +"chromewebstore" "chrysler" "chupachups" "cilium" @@ -699,7 +695,6 @@ "cryengine" "cryptpad" "crystal" -"csharp" "css3" "cssdesignawards" "cssmodules" @@ -720,7 +715,6 @@ "daf" "dailydotdev" "dailymotion" -"daimler" "daisyui" "dapr" "darkreader" @@ -738,7 +732,6 @@ "datagrip" "dataiku" "datastax" -"dataverse" "datefns" "datev" "datocms" @@ -772,7 +765,6 @@ "dependencycheck" "depositphotos" "derspiegel" -"designernews" "deutschebahn" "deutschebank" "deutschepost" @@ -810,7 +802,6 @@ "docsify" "doctrine" "docusaurus" -"docusign" "dogecoin" "doi" "dolby" @@ -847,7 +838,6 @@ "dvc" "dwavesystems" "dwm" -"dynamics365" "dynatrace" "e" "e3" @@ -1175,7 +1165,6 @@ "googledatastudio" "googledisplayandvideo360" "googledocs" -"googledomains" "googledrive" "googleearth" "googleearthengine" @@ -1183,7 +1172,6 @@ "googlefonts" "googleforms" "googlegemini" -"googlehangouts" "googlehome" "googlekeep" "googlelens" @@ -1191,14 +1179,11 @@ "googlemarketingplatform" "googlemeet" "googlemessages" -"googlemybusiness" "googlenearby" "googlenews" -"googleoptimize" "googlepay" "googlephotos" "googleplay" -"googlepodcasts" "googlepubsub" "googlescholar" "googlesearchconsole" @@ -1344,9 +1329,6 @@ "iata" "ibeacon" "iberia" -"ibm" -"ibmcloud" -"ibmwatson" "iced" "iceland" "icicibank" @@ -1411,7 +1393,6 @@ "intermarche" "internetarchive" "internetcomputer" -"internetexplorer" "intigriti" "intuit" "invision" @@ -1541,6 +1522,7 @@ "koc" "kodak" "kodi" +"koenigsegg" "kofax" "kofi" "komoot" @@ -1768,25 +1750,6 @@ "microeditor" "microgenetics" "micropython" -"microsoft" -"microsoftacademic" -"microsoftaccess" -"microsoftazure" -"microsoftbing" -"microsoftedge" -"microsoftexcel" -"microsoftexchange" -"microsoftonedrive" -"microsoftonenote" -"microsoftoutlook" -"microsoftpowerpoint" -"microsoftsh
master 08e7f159 1/2: Improve fontification of arguments
branch: master commit 08e7f159e8abe971608aea8cd9b08ec204c8ab8e Author: Arash Esbati Commit: Arash Esbati Improve fontification of arguments * font-latex.el (font-latex-built-in-keyword-classes): Improve fontification of arguments provided as macros and not inside braces. * tests/latex/font-latex-test.el (font-latex-general-fontification): Adjust test. --- font-latex.el | 6 +++--- tests/latex/font-latex-test.el | 17 - 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/font-latex.el b/font-latex.el index ec99d54c..70186748 100644 --- a/font-latex.el +++ b/font-latex.el @@ -241,9 +241,9 @@ variable `font-latex-fontify-sectioning'." ',num) "makeatletter" "makeatother" "newblock" "suppressfloats" "endinput") font-latex-warning-face 1 noarg) ("variable" - (("setlength" "|{\\{") ("settowidth" "|{\\{") ("settoheight" "{{") - ("settodepth" "{{") ("setcounter" "{|{\\") - ("addtolength" "|{\\{") ("addtocounter" "{|{\\") + (("setlength" "|{\\|{\\") ("addtolength" "|{\\|{\\") + ("settowidth" "|{\\|{\\") ("settoheight" "|{\\|{\\") ("settodepth" "|{\\|{\\") + ("setcounter" "{|{\\") ("addtocounter" "{|{\\") ("stepcounter" "{") ("refstepcounter" "{") ("counterwithin" "*[{{") ("counterwithout" "*[{{") ("arabic" "{") ("roman" "{") ("Roman" "{") ("alph" "{") ("Alph" "{") diff --git a/tests/latex/font-latex-test.el b/tests/latex/font-latex-test.el index 94150ac0..3039bf15 100644 --- a/tests/latex/font-latex-test.el +++ b/tests/latex/font-latex-test.el @@ -1,6 +1,6 @@ ;;; font-latex-test.el --- tests for font-latex -*- lexical-binding: t; -*- -;; Copyright (C) 2020-2023 Free Software Foundation, Inc. +;; Copyright (C) 2020-2024 Free Software Foundation, Inc. ;; This file is part of AUCTeX. @@ -107,6 +107,10 @@ $a$") (font-latex-fontify-sectioning 'color)) (insert "\ \\documentclass[10pt]{article} + +\\setlength{\\parskip}{3cm} +\\addtolength\\parskip\\foo + \\begin{document} \\section{Macros} @@ -186,6 +190,17 @@ x (should (font-latex-faces-present-p 'font-lock-function-name-face)) (end-of-line) + ;; Test for \setlength alternatives: + (re-search-forward "setlength{p") + (should (font-latex-faces-present-p 'font-lock-variable-name-face + (match-end 0))) + (re-search-forward "addtolengthp") + (should (font-latex-faces-present-p 'font-lock-variable-name-face + (match-end 0))) + (re-search-forward "f") + (should (font-latex-faces-present-p 'font-lock-variable-name-face + (match-end 0))) + ;; Test for \section macro itself: (re-search-forward "sec\\(?1:t\\)ion{") (should (font-latex-faces-present-p 'font-lock-keyword-face
master updated (7fca4a20 -> 306a561a)
esbati pushed a change to branch master. from 7fca4a20 Update style/acro.el to package v3.8 new 08e7f159 Improve fontification of arguments new 306a561a Add new style/authblk.el Summary of changes: Makefile.in | 3 ++- font-latex.el| 6 ++--- style/{ltablex.el => authblk.el} | 50 tests/latex/font-latex-test.el | 17 +- 4 files changed, 51 insertions(+), 25 deletions(-) copy style/{ltablex.el => authblk.el} (54%)
master 306a561a 2/2: Add new style/authblk.el
branch: master commit 306a561ad5ec82140fc45598d999cebd3c5e750a Author: Arash Esbati Commit: Arash Esbati Add new style/authblk.el * Makefile.in (STYLESRC): Add new style. * style/authblk.el ("authblk"): New file. --- Makefile.in | 3 ++- style/authblk.el | 73 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 8605246e..d38f7a3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -199,7 +199,8 @@ STYLESRC = style/prosper.el \ style/physics.el style/soul.el style/algpseudocodex.el \ style/wasysym.el style/refcount.el style/simpleicons.el \ style/changebar.el style/amsrefs.el style/standalone.el \ - style/diagbox.el style/contract.el style/enotez.el + style/diagbox.el style/contract.el style/enotez.el \ + style/authblk.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/style/authblk.el b/style/authblk.el new file mode 100644 index ..9e482d28 --- /dev/null +++ b/style/authblk.el @@ -0,0 +1,73 @@ +;;; authblk.el --- AUCTeX style for `authblk.sty' (v1.3) -*- lexical-binding: t; -*- + +;; Copyright (C) 2024 Free Software Foundation, Inc. + +;; Author: Arash Esbati +;; Maintainer: auctex-devel@gnu.org +;; Created: 2024-07-05 +;; 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. + +;;; Commentary: + +;; This file adds support for `authblk.sty' (v1.3) from 2001/02/27. +;; `authblk.sty' is part of TeXLive. + +;;; Code: + +(require 'tex) +(require 'latex) + +;; Silence the compiler: +(declare-function font-latex-add-keywords + "font-latex" + (keywords class)) + +(TeX-add-style-hook + "authblk" + (lambda () + (TeX-add-symbols +'("author" ["Footnote marker"] LaTeX-arg-author) +'("affil" ["Footnote marker"] "Affiliation") +'("authorcr" 0) +"Authfont" +"Affilfont" +"Authsep" +"Authand" +"Authands") + + (LaTeX-add-counters "Maxaffil") + (LaTeX-add-lengths "affilsep") + + ;; Fontification + (when (and (featurep 'font-latex) + (eq TeX-install-font-lock 'font-latex-setup)) + (font-latex-add-keywords '(("author" "[{") +("affil" "[{")) + 'textual) + (font-latex-add-keywords '("authorcr") + 'warning))) + TeX-dialect) + +(defvar LaTeX-authblk-package-options + '("blocks" "noblocks" "max2" "max3" "max4" "max5" "max6" +"auth-sc" "auth-sc-lg" "auth-lg" "affil-sl" "affil-it" "german") + "Package options for the authblk package.") + +;;; authblk.el ends here
Re: [master does not generate the correct AUCTeX version ]
Uwe Brauer writes: > Here is the result (Thinkpad X1 2017) > > > | Branch | command | compilation time | > |+--+--| > | main | make | 3:20 | > | main | make -j8 | 1:20 | > |+--+--| > | master | make | 0:13 | > | maser | make -j8 | 0:08 | Thnx. Currently, I don't see that we change the compilation on the main branch, so it is what it is ATM. Best, Arash
Re: Drop tarball releases and go ELPA only
Tassilo Horn writes: > Mosè Giordano writes: > >> On Mon, 1 Jul 2024 at 14:17, Arash Esbati wrote: >> >> I'm personally generally in favour of moving the release process >> entirely to ELPA! > > Ditto. Same here. >>> • Archive current master as auctex-13, and keep main as default branch. >>> This means that every commit generates a new release on ELPA-devel. >>> • Archive current master as auctex-13, and introduce a new intermediate >>> default branch, say develop or some such. And then merge into main on >>> a regular basis. >> >> My only comment is that I think it'd still be valuable to keep having >> stable releases (published through ELPA) every now and then, just as >> it is now, and not go full "every commit is a release" mode. > > That's already the case. Every pushed commit on the main branch [1] > results in a new release in the GNU-devel ELPA repository for the > adventurous users and every change in the Version header results in a > release in the stable GNU ELPA repository. > > Of course, if major changes are to be made, one can still split a new > feature branch off main where changes have no effect on what's published > until they are done and merged back to main. So you say we should go for the first option? > (I just saw that we changed the "[Unreleased]" heading to "[14.0.6] - > 2024-06-30" after publishing 14.0.6. A chance to improve next > time. :-)) Yes, mea culpa. Hopefully things work out better next time. Best, Arash
Re: [master does not generate the correct AUCTeX version ]
Uwe Brauer writes: > BTW any change to accelerate the byte compilation on main or will it > stay this way in order to spot error more easily? I think I asked a couple of times but can't remember the answer. Do you get an improvement on the main branch if you do: make -j$(nproc) Best, Arash
Re: [master does not generate the correct AUCTeX version ]
Uwe Brauer writes: > This is now the problem, I obtain > > Can't find date with git, trying with ChangeLog.1... > echo @set VERSION 13.3 >version.texi > echo @set UPDATED 2024-01-17 >>version.texi > > Didn't we have a similar problem on main and it resolved there, I don't > remember how. I can't remember either. The makefiles in AUCTeX repo rely on Git; I'm not sure how to fix this. So for your setup, you need an up-to-date ChangeLog.1, right? I presume you can't update that yourself due to lack of Git? Best, Arash
Re: [master does not generate the correct AUCTeX version ]
Uwe Brauer writes: > I pulled again auctex master! Actual commit is 7fca4a201637 > I run > > make distclean > ./configure (some options) > make > > And hu tex-site.el now contains > > (defconst AUCTeX-version "13.3" > "AUCTeX version. > If not a regular release, the date of the last change.") > > (defconst AUCTeX-date "2024-01-17" > "AUCTeX release date using the ISO 8601 format, -mm-dd.") I'm on the same revision, and this is what I see: -> grep AUCTeX-version tex-site.el (defconst AUCTeX-version "2024-06-30" Try: make distclean ./autogen.sh ./configure (some options) make Maybe that helps. Best, Arash
master 7fca4a20: Update style/acro.el to package v3.8
branch: master commit 7fca4a201637b1f3ca8fb127b55296853dbd1f83 Author: Arash Esbati Commit: Arash Esbati Update style/acro.el to package v3.8 * style/acro.el (LaTeX-acro-acsetup-key-val-options) (LaTeX-acro-declareacronym-key-val-options) (LaTeX-acro-printacronyms-key-val-options) (LaTeX-acro-ac-key-val-options): New variables. (LaTeX-acro-cleanup): Delete the conditional for the "macros" package option which isn't provided by package v3.8. (LaTeX-arg-acro-key-val): Delete function and use `TeX-arg-key-val' instead. ("acro"): Adjust macros and fontification to package v3.8. Use 'reference' style fontification for acronym macros. (LaTeX-acro-package-options-list): Update to options of v3.8. --- style/acro.el | 905 ++ 1 file changed, 721 insertions(+), 184 deletions(-) diff --git a/style/acro.el b/style/acro.el index 26e32b8d..f558db11 100644 --- a/style/acro.el +++ b/style/acro.el @@ -1,6 +1,6 @@ -;;; acro.el --- AUCTeX style for `acro.sty' version 1.2a. -*- lexical-binding: t; -*- +;;; acro.el --- AUCTeX style for `acro.sty' version v3.8 -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2015, 2018, 2020 Free Software Foundation, Inc. +;; Copyright (C) 2013-2024 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Author: Mosè Giordano @@ -25,7 +25,7 @@ ;;; Commentary: -;; This file adds support for `acro.sty' version 1.2a. +;; This file adds support for `acro.sty' version v3.8. ;;; Code: @@ -37,51 +37,203 @@ "font-latex" (keywords class)) -(defvar LaTeX-acro-package-options-list - '(;; General Options -("version" ("0" "1")) +(defvar LaTeX-acro-acsetup-key-val-options + '(("case-sensitive" ("true" "false")) +("case-insensitive" ("true" "false")) +;; 6.1. Basic properties +("use-id-as-short" ("true" "false")) +;; 9. The first or full appearance +("first-style" ("long-short" "short-long" "short" "long" "footnote")) +("subsequent-style" ("long-short" "short-long" "short" "long" "footnote")) +;; 10. Single appearances of an acronym ("single" ("true" "false")) -("hyperref" ("true" "false")) -("record-pages" ("true" "false")) -("only-used" ("true" "false")) -("mark-as-used" ("first" "any")) -("macros" ("true" "false")) -("xspace" ("true" "false")) -("strict" ("true" "false")) -("sort" ("true" "false")) -("cite" ("all" "first" "none")) -("cite-cmd") -("cite-space") +("single-style" ("long-short" "short-long" "short" "long" "footnote")) +;; 11.1. The main command and its options +("list/template" ("description" "tabular" "longtable" + "supertabular" "tabularray")) +("list/display" ("all" "used")) +("list/include") +("list/exclude") +("list/add" ("true" "false")) +("list/heading" ("none" "section" "section*" "chapter" "chapter*")) +("list/name") +("list/preamble") +("list/locale/display" ("true" "false")) +;; 11.2. Add page numbers to the list +("pages/display" ("first" "all" "none")) +("pages/seq/use" ("true" "false")) +("pages/seq/pre") +("pages/seq/threshold") +("pages/fill") +("pages/name" ("true" "false")) +;; 11.3. Filter lists using tags +("list/exclude") +("list/include") +;; 11.4. Local lists +("barriers/use" ("true" "false")) +("list/local" ("true" "false")) +;; 12. Formatting +("format") +("format/short") +("format/long") +("format/first-long") +("format/alt") +("format/extra") +("format/foreign") +("format/list") +("format/replace" ("true" "false")) +("sho
Drop tarball releases and go ELPA only
Hi all, you may have seen that there was some work in creating a new branch 'main' which can be used easily to make an ELPA release by anyone who has write access to AUCTeX repo. We have now 6 releases this way under our belt and it works quite smooth. The logical consequence from this effort is to drop the yearly tarball release completely and go ELPA only. I think this has some advantages: • Take the burden from Tassilo/Mosè for every ELPA/tarball release • Provide a test-release facility with ELPA-devel • Simplify the code base (c.f. GNUmakefile in main-branch) • Get rid of updating the homepage which is not really fun and linking the manual to ELPA page which is formatted better (IMO) If we agree on this, some work is still ahead of us, mainly deleting bigger portions of text in auctex.texi, and of course the way we want to organize the branches. I see 2 options: • Archive current master as auctex-13, and keep main as default branch. This means that every commit generates a new release on ELPA-devel. • Archive current master as auctex-13, and introduce a new intermediate default branch, say develop or some such. And then merge into main on a regular basis. I don't have a strong opinion on the above, but switching between the current master and main is somewhat cumbersome because of the different heritage these branches have (take adding a new style for instance). I'm adding also the inactive maintainers and the distro maintainers I know of to this mail, any comments welcome. Best, Arash
Re: activating LaTeX-mode automatically
Paul Nelson writes: > Indeed, your suggestion (or deleting ":mode" from mine) fixes things. > I get now that *.tex maps to tex-mode which remaps to TeX-tex-mode, > etc. Thanks for your feedback. Good to know that AUCTeX is meanwhile a better use-package citizen ;-) I guess we have to update the manual in this regard. Best, Arash
main 3091f2ca: * auctex.el: Shorten 'Commentary' section to 4 lines.
branch: main commit 3091f2ca61e4129f1e4eb9eda9b0fbcd857f21f2 Author: Arash Esbati Commit: Arash Esbati * auctex.el: Shorten 'Commentary' section to 4 lines. --- auctex.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/auctex.el b/auctex.el index 1c320a1c..2f7af507 100644 --- a/auctex.el +++ b/auctex.el @@ -28,9 +28,8 @@ ;; AUCTeX is a comprehensive customizable integrated environment for ;; writing input files for TeX, LaTeX, ConTeXt, Texinfo, and docTeX -;; using Emacs. One component of AUCTeX is preview-latex, a combination -;; of folding and in-source previewing that provides true "What You See -;; Is What You Get" experience in the sourcebuffer. +;; using Emacs. One component of AUCTeX is preview-latex which provides +;; true "What You See Is What You Get" experience in the sourcebuffer. ;;; Code:
Re: activating LaTeX-mode automatically
Hi Paul, Paul Nelson writes: > What's the recommended way nowadays to activate LaTeX-mode > automatically upon opening a tex file? I would have thought that > > (use-package tex > :ensure auctex > :mode ("\\.tex\\'" . LaTeX-mode)) I presume you've installed AUCTeX from ELPA, does this work as expected? (use-package auctex :ensure t) Best, Arash
main updated (be36aa96 -> 3bfbf2c5)
esbati pushed a change to branch main. from be36aa96 Release GNU AUCTeX 14.0.6 adds 71723188 ; * NEWS.org: Update the file. new 3bfbf2c5 Merge remote-tracking branch 'origin/master' Summary of changes: NEWS.org | 2 ++ 1 file changed, 2 insertions(+)
main 3bfbf2c5: Merge remote-tracking branch 'origin/master'
branch: main commit 3bfbf2c55f3b25e80149e0075cda32f69f37cf77 Merge: be36aa96 71723188 Author: Arash Esbati Commit: Arash Esbati Merge remote-tracking branch 'origin/master' --- NEWS.org | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.org b/NEWS.org index 545adce2..d8ce5658 100644 --- a/NEWS.org +++ b/NEWS.org @@ -8,6 +8,8 @@ * [Unreleased] +* [14.0.6] - 2024-06-30 + ** Added - Complete support for in-buffer completion of color support macros.
master 71723188: ; * NEWS.org: Update the file.
branch: master commit 71723188b7156fac06def9213d2bd66ca448d60e Author: Arash Esbati Commit: Arash Esbati ; * NEWS.org: Update the file. --- NEWS.org | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.org b/NEWS.org index 545adce2..d8ce5658 100644 --- a/NEWS.org +++ b/NEWS.org @@ -8,6 +8,8 @@ * [Unreleased] +* [14.0.6] - 2024-06-30 + ** Added - Complete support for in-buffer completion of color support macros.
main updated (9f8ee9b5 -> be36aa96)
esbati pushed a change to branch main. from 9f8ee9b5 Merge remote-tracking branch 'origin/master' adds b3305a78 Prefer `setq-local' in doc/auctex.texi adds e0e0fe67 Prefer `setq-local' in preview.el.in adds 0e47fa35 Update style/simpleicons.el to package v12.4.0 adds d3d0d1bc Add new style/enotez.el adds c57690f6 Make syntax prop. run even when font lock is disabled (bug#71164) adds d039aab7 * latex/preview.dtx: Bump date and version. new d15c8a65 Merge remote-tracking branch 'origin/master' new be36aa96 Release GNU AUCTeX 14.0.6 Summary of changes: auctex.el| 2 +- doc/auctex.texi | 8 ++-- font-latex.el| 14 -- latex/preview.dtx| 4 +- preview.el | 5 +-- style/enotez.el | 117 +++ style/simpleicons.el | 65 ++-- 7 files changed, 198 insertions(+), 17 deletions(-) create mode 100644 style/enotez.el
main be36aa96 2/2: Release GNU AUCTeX 14.0.6
branch: main commit be36aa96c813125a1f3849e13223fc68cd09e847 Author: Arash Esbati Commit: Arash Esbati Release GNU AUCTeX 14.0.6 * auctex.el: Bump version for ELPA release. --- auctex.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auctex.el b/auctex.el index b308fd78..1c320a1c 100644 --- a/auctex.el +++ b/auctex.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2014-2024 Free Software Foundation, Inc. -;; Version: 14.0.5 +;; Version: 14.0.6 ;; URL: https://www.gnu.org/software/auctex/ ;; Maintainer: auctex-devel@gnu.org ;; Notifications-To: auctex-di...@gnu.org
main d15c8a65 1/2: Merge remote-tracking branch 'origin/master'
branch: main commit d15c8a65a7c6440c3cf54e6a1265fafae45c110d Merge: 9f8ee9b5 d039aab7 Author: Arash Esbati Commit: Arash Esbati Merge remote-tracking branch 'origin/master' --- doc/auctex.texi | 8 ++-- font-latex.el| 14 -- latex/preview.dtx| 4 +- preview.el | 5 +-- style/enotez.el | 117 +++ style/simpleicons.el | 65 ++-- 6 files changed, 197 insertions(+), 16 deletions(-) diff --git a/doc/auctex.texi b/doc/auctex.texi index c79e8c20..2d711fec 100644 --- a/doc/auctex.texi +++ b/doc/auctex.texi @@ -452,11 +452,11 @@ and @samp{\(...\)} in @LaTeX{} files by pressing @kbd{$}, add the following to your init file @lisp (add-hook 'plain-TeX-mode-hook - (lambda () (set (make-local-variable 'TeX-electric-math) - (cons "$" "$" + (lambda () (setq-local TeX-electric-math + (cons "$" "$" (add-hook 'LaTeX-mode-hook - (lambda () (set (make-local-variable 'TeX-electric-math) - (cons "\\(" "\\)" + (lambda () (setq-local TeX-electric-math + (cons "\\(" "\\)" @end lisp Math mode which didn't start with dollar(s) shouldn't be closed with dollar. diff --git a/font-latex.el b/font-latex.el index 0307cd10..ec99d54c 100644 --- a/font-latex.el +++ b/font-latex.el @@ -1310,10 +1310,16 @@ triggers Font Lock to recognize the change." (defun font-latex--make-syntax-propertize-function () "Return a `syntax-propertize-function' for (La|Doc)TeX documents." - (let ((kws ;; (if (derived-mode-p 'docTeX-mode) - ;; font-latex-doctex-syntactic-keywords - font-latex-syntactic-keywords)) ;; ) -(syntax-propertize-via-font-lock kws))) + (let* ((kws ;; (if (derived-mode-p 'docTeX-mode) + ;; font-latex-doctex-syntactic-keywords + font-latex-syntactic-keywords) ;; ) + (func (syntax-propertize-via-font-lock kws))) +(lambda (start end) + ;; Initialize font lock variables even when font lock is disabled. + ;; This treatment is necessary because syntax propertize depends + ;; on font lock facility. (bug#71164) + (or font-lock-set-defaults (font-lock-set-defaults)) + (funcall func start end ;;;###autoload (defun font-latex-setup () diff --git a/latex/preview.dtx b/latex/preview.dtx index 23624456..cafb0363 100644 --- a/latex/preview.dtx +++ b/latex/preview.dtx @@ -437,8 +437,8 @@ %<*style> %<*!active> \NeedsTeXFormat{LaTeX2e} -\def\pr@version{13.3} -\def\pr@date{2024/01/17} +\def\pr@version{14.0.6} +\def\pr@date{2024/06/30} \ProvidesPackage{preview}[\pr@date\space \pr@version\space (AUCTeX/preview-latex)] %\end{macrocode} % \end{macro} diff --git a/preview.el b/preview.el index 7d5d64f0..e4d674ad 100644 --- a/preview.el +++ b/preview.el @@ -1299,7 +1299,7 @@ are functions to call on preview's clicks." "*Preview-Ghostscript-Error*"))) (with-current-buffer buff (kill-all-local-variables) - (set (make-local-variable 'view-exit-action) #'kill-buffer) + (setq-local view-exit-action #'kill-buffer) (setq buffer-undo-list t) (erase-buffer) (insert string) @@ -3087,8 +3087,7 @@ pp") (defun preview-mode-setup () "Setup proper buffer hooks and behavior for previews." - (set (make-local-variable 'desktop-save-buffer) - #'desktop-buffer-preview-misc-data) + (setq-local desktop-save-buffer #'desktop-buffer-preview-misc-data) (add-hook 'pre-command-hook #'preview-mark-point nil t) (add-hook 'post-command-hook #'preview-move-point nil t) (when (TeX-buffer-file-name) diff --git a/style/enotez.el b/style/enotez.el new file mode 100644 index ..a247dacf --- /dev/null +++ b/style/enotez.el @@ -0,0 +1,117 @@ +;;; enotez.el --- AUCTeX style for `enotez.sty' (v0.10d) -*- lexical-binding: t; -*- + +;; Copyright (C) 2024 Free Software Foundation, Inc. + +;; Author: Arash Esbati +;; Maintainer: auctex-devel@gnu.org +;; Created: 2024-06-28 +;; 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 Found
master d039aab7: * latex/preview.dtx: Bump date and version.
branch: master commit d039aab7e2e95ab530237118274b9e9375cc8256 Author: Arash Esbati Commit: Arash Esbati * latex/preview.dtx: Bump date and version. --- latex/preview.dtx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latex/preview.dtx b/latex/preview.dtx index 23624456..cafb0363 100644 --- a/latex/preview.dtx +++ b/latex/preview.dtx @@ -437,8 +437,8 @@ %<*style> %<*!active> \NeedsTeXFormat{LaTeX2e} -\def\pr@version{13.3} -\def\pr@date{2024/01/17} +\def\pr@version{14.0.6} +\def\pr@date{2024/06/30} \ProvidesPackage{preview}[\pr@date\space \pr@version\space (AUCTeX/preview-latex)] %\end{macrocode} % \end{macro}
master d3d0d1bc: Add new style/enotez.el
branch: master commit d3d0d1bc91f600ca20840fc45987c92bd1b88496 Author: Arash Esbati Commit: Arash Esbati Add new style/enotez.el * Makefile.in (STYLESRC): Add new style. * style/enotez.el: New file. --- Makefile.in | 2 +- style/enotez.el | 117 2 files changed, 118 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index d0066af8..8605246e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -199,7 +199,7 @@ STYLESRC = style/prosper.el \ style/physics.el style/soul.el style/algpseudocodex.el \ style/wasysym.el style/refcount.el style/simpleicons.el \ style/changebar.el style/amsrefs.el style/standalone.el \ - style/diagbox.el style/contract.el + style/diagbox.el style/contract.el style/enotez.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/style/enotez.el b/style/enotez.el new file mode 100644 index ..a247dacf --- /dev/null +++ b/style/enotez.el @@ -0,0 +1,117 @@ +;;; enotez.el --- AUCTeX style for `enotez.sty' (v0.10d) -*- lexical-binding: t; -*- + +;; Copyright (C) 2024 Free Software Foundation, Inc. + +;; Author: Arash Esbati +;; Maintainer: auctex-devel@gnu.org +;; Created: 2024-06-28 +;; 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. + +;;; Commentary: + +;; This file adds support for `enotez.sty' (v0.10d) from 2022/01/04. +;; `enotez.sty' is part of TeXLive. + +;;; Code: + +(require 'tex) +(require 'latex) + +;; Silence the compiler: +(declare-function font-latex-add-keywords + "font-latex" + (keywords class)) + +(defvar LaTeX-enotez-key-val-options + '(("list-name") +("reset" ("true" "false")) +("counter-format" ("arabic" "alph" "Alph" "roman" "Roman" "symbols")) +("mark-format") +("mark-cs") +("backref" ("true" "false")) +("totoc" ("subsection" "section" "chapter" "part" "auto" "false")) +("list-heading") +("list-style" ("plain" "custom" "description" "itemize")) +("split" ("section" "chapter" "false")) +("split-sectioning") +("split-heading") +("split-title")) + "Key=val options for the \\setenotez macro.") + +(defun LaTeX-enotez-key-val-options () + "Return updated key=val options for the \\setenotez macro." + (let ((len (mapcar (lambda (x) (concat TeX-esc x)) + (mapcar #'car (LaTeX-length-list) +(append + `(("list-preamble-skip" ,len) + ("list-postamble-skip" ,len)) + LaTeX-enotez-key-val-options))) + +(TeX-add-style-hook + "enotez" + (lambda () + (TeX-add-symbols +;; 3.1 Placing the Notes +'("endnote" ["Mark"] t) +'("endnotemark" ["Mark"]) +'("endnotetext" t) + +;; 3.2 Printing the Notes +'("printendnotes" + [TeX-arg-completing-read ("plain" "custom" "description" "itemize")]) +'("printendnotes*" + [TeX-arg-completing-read ("plain" "custom" "description" "itemize")]) +'("AtEveryEndnotesList" t) +'("AtNextEndnotesList" t) +'("AfterEveryEndnotesList" t) +'("AfterNextEndnotesList" t) + +;; 4.1 Package Options +'("setenotez" (TeX-arg-key-val (LaTeX-enotez-key-val-options))) + +;; 5 Collect Notes Section-wise and Print List Stepwise +'("AtEveryListSplit" t) +'("AfterEveryListSplit" t) +"EnotezCurrentSplitTitle" +'("NewSplitTitleTag" 2)) + + ;; Fontification + (when (and (featurep 'font-latex) + (eq TeX-install-font-lock 'font-latex-setup)) + (font-latex-add-keywords '(("endnote
master 0e47fa35: Update style/simpleicons.el to package v12.4.0
branch: master commit 0e47fa35c2ed3a44a7f65b695ba1df86264d78dd Author: Arash Esbati Commit: Arash Esbati Update style/simpleicons.el to package v12.4.0 * style/simpleicons.el (LaTeX-simpleicons-icons): Update icon names. --- style/simpleicons.el | 65 +--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/style/simpleicons.el b/style/simpleicons.el index bf32db18..f04d2e15 100644 --- a/style/simpleicons.el +++ b/style/simpleicons.el @@ -1,4 +1,4 @@ -;;; simpleicons.el --- AUCTeX style for `simpleicons.sty' (v12.0.0) -*- lexical-binding: t; -*- +;;; simpleicons.el --- AUCTeX style for `simpleicons.sty' (v12.4.0) -*- lexical-binding: t; -*- ;; Copyright (C) 2023--2024 Free Software Foundation, Inc. @@ -26,8 +26,8 @@ ;;; Commentary: -;; This file adds support for `simpleicons.sty' (v12.0.0) from -;; 2024/05/31. `simpleicons.sty' is part of TeXLive. +;; This file adds support for `simpleicons.sty' (v12.4.0) from +;; 2024/06/28. `simpleicons.sty' is part of TeXLive. ;;; Code: @@ -41,7 +41,10 @@ (defvar LaTeX-simpleicons-icons '("1001tracklists" +"1dot1dot1dot1" +"1panel" "1password" +"2fas" "2k" "365datascience" "3m" @@ -93,6 +96,7 @@ "adroll" "adventofcode" "adyen" +"aegisauthenticator" "aerlingus" "aeroflot" "aeromexico" @@ -200,6 +204,7 @@ "anilist" "animalplanet" "ankermake" +"anki" "ansible" "answer" "ansys" @@ -225,6 +230,7 @@ "apachegroovy" "apacheguacamole" "apachehadoop" +"apachehbase" "apachehive" "apachejmeter" "apachekafka" @@ -238,6 +244,7 @@ "apachesolr" "apachespark" "apachestorm" +"apachesuperset" "apachetomcat" "aparat" "apifox" @@ -288,7 +295,10 @@ "aseprite" "askfm" "assemblyscript" +"asterisk" "astonmartin" +"astra" +"astral" "astro" "asus" "atandt" @@ -308,6 +318,7 @@ "authentik" "authy" "autocad" +"autocannon" "autodesk" "autodeskmaya" "autodeskrevit" @@ -337,6 +348,7 @@ "azurepipelines" "babel" "babelio" +"babylondotjs" "backblaze" "backbonedotjs" "backendless" @@ -345,6 +357,7 @@ "baidu" "bakalari" "bamboo" +"bambulab" "bandcamp" "bandlab" "bandrautomation" @@ -364,6 +377,7 @@ "beats" "beatsbydre" "beatstars" +"beekeeperstudio" "behance" "beijingsubway" "bem" @@ -446,6 +460,7 @@ "bricks" "britishairways" "broadcom" +"bruno" "bsd" "bspwm" "bt" @@ -605,6 +620,7 @@ "codenewbie" "codepen" "codeproject" +"coder" "codersrank" "coderwall" "codesandbox" @@ -622,6 +638,7 @@ "coinbase" "coinmarketcap" "comicfury" +"comma" "commerzbank" "commitlint" "commodore" @@ -684,6 +701,7 @@ "crystal" "csharp" "css3" +"cssdesignawards" "cssmodules" "csswizardry" "cts" @@ -722,6 +740,7 @@ "datastax" "dataverse" "datefns" +"datev" "datocms" "datto" "davinciresolve" @@ -767,6 +786,7 @@ "diagramsdotnet" "dialogflow" "diaspora" +"dictionarydotcom" "digg" "digikeyelectronics" "digitalocean" @@ -788,6 +808,7 @@ "docker" "docsdotrs" "docsify" +"doctrine" "docusaurus" "docusign" "dogecoin" @@ -800,6 +821,7 @@ "douban" "doubanread" "dovecot" +"dovetail" "doxygen" "dpd" "dragonframe" @@ -821,6 +843,7 @@
master e0e0fe67: Prefer `setq-local' in preview.el.in
branch: master commit e0e0fe673304e4955e2a50845182ef7e88a90b49 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in preview.el.in * preview.el.in (preview-mouse-open-error, preview-mode-setup): Prefer `setq-local' over `set' and `make-local-variable' combination. --- preview.el.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/preview.el.in b/preview.el.in index 9404bc94..e9cf622b 100644 --- a/preview.el.in +++ b/preview.el.in @@ -1299,7 +1299,7 @@ are functions to call on preview's clicks." "*Preview-Ghostscript-Error*"))) (with-current-buffer buff (kill-all-local-variables) - (set (make-local-variable 'view-exit-action) #'kill-buffer) + (setq-local view-exit-action #'kill-buffer) (setq buffer-undo-list t) (erase-buffer) (insert string) @@ -3087,8 +3087,7 @@ pp") (defun preview-mode-setup () "Setup proper buffer hooks and behavior for previews." - (set (make-local-variable 'desktop-save-buffer) - #'desktop-buffer-preview-misc-data) + (setq-local desktop-save-buffer #'desktop-buffer-preview-misc-data) (add-hook 'pre-command-hook #'preview-mark-point nil t) (add-hook 'post-command-hook #'preview-move-point nil t) (when (TeX-buffer-file-name)
master b3305a78: Prefer `setq-local' in doc/auctex.texi
branch: master commit b3305a78fc4017d4d223a1599a003fddeb2c0dd2 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in doc/auctex.texi * doc/auctex.texi (Quotes): Prefer `setq-local' over `set' and `make-local-variable' combination. --- doc/auctex.texi | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/auctex.texi b/doc/auctex.texi index c79e8c20..2d711fec 100644 --- a/doc/auctex.texi +++ b/doc/auctex.texi @@ -452,11 +452,11 @@ and @samp{\(...\)} in @LaTeX{} files by pressing @kbd{$}, add the following to your init file @lisp (add-hook 'plain-TeX-mode-hook - (lambda () (set (make-local-variable 'TeX-electric-math) - (cons "$" "$" + (lambda () (setq-local TeX-electric-math + (cons "$" "$" (add-hook 'LaTeX-mode-hook - (lambda () (set (make-local-variable 'TeX-electric-math) - (cons "\\(" "\\)" + (lambda () (setq-local TeX-electric-math + (cons "\\(" "\\)" @end lisp Math mode which didn't start with dollar(s) shouldn't be closed with dollar.
main updated (f38b5ac7 -> 9f8ee9b5)
esbati pushed a change to branch main. from f38b5ac7 Merge remote-tracking branch 'origin/master' adds f6caa493 * tex.el (TeX-LaTeX-sentinel): Parse warning from endnotes. new 9f8ee9b5 Merge remote-tracking branch 'origin/master' Summary of changes: tex.el | 5 + 1 file changed, 5 insertions(+)
main 9f8ee9b5: Merge remote-tracking branch 'origin/master'
branch: main commit 9f8ee9b57f99427c7df5923e35a1b3a008953c32 Merge: f38b5ac7 f6caa493 Author: Arash Esbati Commit: Arash Esbati Merge remote-tracking branch 'origin/master' --- tex.el | 5 + 1 file changed, 5 insertions(+) diff --git a/tex.el b/tex.el index 55f592df..e67d2059 100644 --- a/tex.el +++ b/tex.el @@ -8648,6 +8648,11 @@ Changebar info has changed." nil t) (message "%s" "You should run LaTeX again to get the change bars right") (setq TeX-command-next TeX-command-default)) +((re-search-forward "^LaTeX Warning: Endnotes may have changed. \ +Rerun to get them right" nil t) + (message + "%s" "You should run LaTeX again to get the endnotes right") + (setq TeX-command-next TeX-command-default)) ((re-search-forward "^\\* xsim warning: \"rerun\"" nil t) (message "%s" "You should run LaTeX again to synchronize exercise properties")
master f6caa493: * tex.el (TeX-LaTeX-sentinel): Parse warning from endnotes.
branch: master commit f6caa4938c9cdb09cbda0c85a8e8869c090cb326 Author: Arash Esbati Commit: Arash Esbati * tex.el (TeX-LaTeX-sentinel): Parse warning from endnotes. --- tex.el | 5 + 1 file changed, 5 insertions(+) diff --git a/tex.el b/tex.el index 55f592df..e67d2059 100644 --- a/tex.el +++ b/tex.el @@ -8648,6 +8648,11 @@ Changebar info has changed." nil t) (message "%s" "You should run LaTeX again to get the change bars right") (setq TeX-command-next TeX-command-default)) +((re-search-forward "^LaTeX Warning: Endnotes may have changed. \ +Rerun to get them right" nil t) + (message + "%s" "You should run LaTeX again to get the endnotes right") + (setq TeX-command-next TeX-command-default)) ((re-search-forward "^\\* xsim warning: \"rerun\"" nil t) (message "%s" "You should run LaTeX again to synchronize exercise properties")
Re: CTAN update
Ikumi Keita writes: > I'm fine to have a new ELPA release now. :-) Great, I've just updated the main branch. I'll wait a day or two and make a release over the weekend. Best, Arash
main f38b5ac7: Merge remote-tracking branch 'origin/master'
branch: main commit f38b5ac7b1ee1f26fd05dcfbc9b04fa69ca4f765 Merge: a7f2e25f f52eeb28 Author: Arash Esbati Commit: Arash Esbati Merge remote-tracking branch 'origin/master' --- NEWS.org | 10 ++ RELEASE | 7 +- bib-cite.el | 41 context-en.el| 6 +- context.el | 35 --- doc/auctex.texi | 11 +- doc/changes.texi | 6 ++ doc/preview-latex.texi | 12 +-- font-latex.el| 6 +- latex.el | 65 ++-- latex/preview.dtx| 8 +- lpath.el | 1 + plain-tex.el | 16 ++- preview.el | 5 +- style/amsmath.el | 17 ++-- style/appendix.el| 7 +- style/array.el | 14 +-- style/beamer.el | 21 ++-- style/contract.el| 161 ++ style/dcolumn.el | 6 +- style/diagbox.el | 93 + style/epigraph.el| 11 +- style/exam.el| 19 ++-- style/hyperref.el| 13 ++- style/l3doc.el | 8 +- style/ltugboat.el| 4 +- style/paracol.el | 2 +- style/plext.el | 13 +-- style/preview.el | 20 ++-- style/simpleicons.el | 232 --- style/siunitx.el | 6 +- style/standalone.el | 166 +++ style/tabularx.el| 6 +- style/tabulary.el| 6 +- style/tcolorboxlib-raster.el | 11 +- style/tex-live.el| 6 +- tex-bar.el | 1 + tex-font.el | 25 +++-- tex-info.el | 52 +- tex-jp.el| 1 + tex-style.el | 1 + tex-wizard.el| 3 +- tex.el | 64 toolbar-x.el | 6 +- 44 files changed, 932 insertions(+), 292 deletions(-) diff --git a/NEWS.org b/NEWS.org index 92c41293..545adce2 100644 --- a/NEWS.org +++ b/NEWS.org @@ -8,6 +8,12 @@ * [Unreleased] +** Added + +- Complete support for in-buffer completion of color support macros. +- Add new support files =style/contract.el=, =style/diagbox.el= and + =style/standalone.el=. + ** Fixed - Add appropriate ~delete-selection~ properties for @@ -39,6 +45,10 @@ ** Removed - Delete function ~LaTeX-env-contents~. +- Delete obsolete variables ~TeX-symbol-marker~, + ~TeX-symbol-marker-pos~, ~TeX-dollar-sign~, ~TeX-dollar-string~ and + ~TeX-dollar-regexp~. +- Delete obsolete minor-mode ~TeX-Omega-mode~. * [14.0.5] - 2024-05-19 diff --git a/RELEASE b/RELEASE index 040e72a8..e37ac24b 100644 --- a/RELEASE +++ b/RELEASE @@ -78,11 +78,8 @@ Future development and additional information AUCTeX is proceeding as a GNU project with the long-term intent of merging it into Emacs. For that reason, all new contributors need to -assign copyright to their contributions to the FSF (the usual -procedure for Emacs contributors). The same holds for past -contributors. The principal authors and maintainers have already done -so, but it would require a diligent and diplomatic volunteer to find -and ask the rest. +assign copyright to their contributions to the FSF (the usual procedure +for Emacs contributors). The same holds for past contributors. Current AUCTeX managers are Arash Esbati, Mosè Giordano, and Tassilo Horn. Everybody is welcome to contribute to the project by reporting diff --git a/bib-cite.el b/bib-cite.el index 7b425cac..5a9f6f83 100644 --- a/bib-cite.el +++ b/bib-cite.el @@ -1,8 +1,9 @@ ;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX file. -*- lexical-binding: t; -*- -;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2022 Free Software Foundation, Inc. +;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2024 Free Software Foundation, Inc. ;; Author:Peter S. Galbraith +;; Maintainer: auctex-devel@gnu.org ;; Created: 06 July 1994 ;; Version: 3.28 (Feb 23 2005) ;; Keywords: bibtex, cite, auctex, emacs @@ -724,17 +725,17 @@ When bib-cite mode is enabled, citations, labels and refs are highlighted when the mouse is over them. Clicking on these highlights with [mouse-2] runs `bib-find', and [mouse-3] runs `bib-display'." (interactive "P") - (set (make-local-variable 'bib-cite-minor-mode) - (if arg - (> (prefix-numeric-value arg) 0) - (not bib-cite-minor-mode))) + (setq-local bib-cite-minor-mode + (if arg + (> (prefix-numeric-value arg) 0) +(not bib-cite-minor-mode))) (cond (bib-cite-minor-mode ;Setup the minor-mode ;; Christoph Wedler's suggestion for xemacs ;; Added for version 2.19 (if (boun
main updated (a7f2e25f -> f38b5ac7)
esbati pushed a change to branch main. from a7f2e25f Create CTAN release tarball for preview adds dab82282 ; Clarify manual reference to `prettify-symbols-mode' adds b4ffddfa ; Checkdoc fixes for interactive commands adds 94eb2e79 Update style/simpleicons.el to package v12.0.0 adds 56debb63 Populate `semantic-symref-filepattern-alist' (bug#71245) adds 9cbe8322 * RELEASE: Clarify requirement for FSF copyright assignment. adds c2015449 Consider class/packages without options as well adds d2f4269e Add new style/standalone.el adds 1d17ee5a ; NEWS.org: Update the file. adds 0b50ae33 ; Fix last change adds 256f4c13 Add new style/diagbox.el adds 0b37ed8a Parse the value of class key adds 25ecdd41 ; Fix last change adds 0bca1c5f ; Fix typo adds f749f73d ; Add Maintainer: auctex-devel@gnu.org to various files adds a67f9eba Improve initial value of `LaTeX-math-menu-unicode' adds ee130344 Add new style/contract.el adds f606c46c ; Improve style/contract.el adds c571713a Add some font commands to default prauctex.cfg (bug#71690) adds dca039f9 ; * style/preview.el ("preview"): Improve fontification. adds 4978f1ac * tex.el (TeX-Omega-mode): Delete obsolete minor-mode. adds 889d0615 Improve suggestion in the manual adds 008399b8 Delete obsolete variables adds b0d45eb0 ; * NEWS.org: Update the file. adds 01e0d2c8 Use `setq-local' adds e0b0e733 Prefer `setq-local' in tex.el adds a1fb4547 Prefer `setq-local' in latex.el adds 7463a646 Prefer `setq-local' in context.el adds e0fb3413 Prefer `setq-local' in font-latex.el adds fe63a90c Prefer `setq-local' in tex-font.el adds 5e0db640 Prefer `setq-local' in plain-tex.el adds 6982a218 Prefer `setq-local' in tex-info.el adds e86f8603 Prefer `setq-local' in bib-cite.el adds 581a6610 Prefer `setq-local' in tex-wizard.el adds f52eeb28 Prefer `setq-local' in toolbar-x.el new f38b5ac7 Merge remote-tracking branch 'origin/master' Summary of changes: NEWS.org | 10 ++ RELEASE | 7 +- bib-cite.el | 41 context-en.el| 6 +- context.el | 35 --- doc/auctex.texi | 11 +- doc/changes.texi | 6 ++ doc/preview-latex.texi | 12 +-- font-latex.el| 6 +- latex.el | 65 ++-- latex/preview.dtx| 8 +- lpath.el | 1 + plain-tex.el | 16 ++- preview.el | 5 +- style/amsmath.el | 17 ++-- style/appendix.el| 7 +- style/array.el | 14 +-- style/beamer.el | 21 ++-- style/contract.el| 161 ++ style/dcolumn.el | 6 +- style/diagbox.el | 93 + style/epigraph.el| 11 +- style/exam.el| 19 ++-- style/hyperref.el| 13 ++- style/l3doc.el | 8 +- style/ltugboat.el| 4 +- style/paracol.el | 2 +- style/plext.el | 13 +-- style/preview.el | 20 ++-- style/simpleicons.el | 232 --- style/siunitx.el | 6 +- style/standalone.el | 166 +++ style/tabularx.el| 6 +- style/tabulary.el| 6 +- style/tcolorboxlib-raster.el | 11 +- style/tex-live.el| 6 +- tex-bar.el | 1 + tex-font.el | 25 +++-- tex-info.el | 52 +- tex-jp.el| 1 + tex-style.el | 1 + tex-wizard.el| 3 +- tex.el | 64 toolbar-x.el | 6 +- 44 files changed, 932 insertions(+), 292 deletions(-) create mode 100644 style/contract.el create mode 100644 style/diagbox.el create mode 100644 style/standalone.el
master 5e0db640 06/10: Prefer `setq-local' in plain-tex.el
branch: master commit 5e0db640620ca16f3470da53f2aac35e8e500365 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in plain-tex.el * plain-tex.el (plain-TeX-common-initialization): Prefer `setq-local' over `set' and `make-local-variable' combination. --- plain-tex.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plain-tex.el b/plain-tex.el index 9bd48eb3..8a92e8a7 100644 --- a/plain-tex.el +++ b/plain-tex.el @@ -172,7 +172,7 @@ Run after mode hooks and file local variables application." (defun plain-TeX-common-initialization () "Common initialization for plain TeX like modes." - (set (make-local-variable 'TeX-style-hook-dialect) plain-TeX-dialect) + (setq-local TeX-style-hook-dialect plain-TeX-dialect) (setq TeX-sentinel-default-function #'TeX-TeX-sentinel) (setq paragraph-start (concat
master e0fb3413 04/10: Prefer `setq-local' in font-latex.el
branch: master commit e0fb3413dbecab4d4b30ffac67a4d33778494957 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in font-latex.el * font-latex.el (font-latex-add-to-syntax-alist) (font-latex-setup): Prefer `setq-local' over `set' and `make-local-variable' combination. --- font-latex.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/font-latex.el b/font-latex.el index d814642a..0307cd10 100644 --- a/font-latex.el +++ b/font-latex.el @@ -1297,8 +1297,8 @@ The entries are added to `font-latex-syntax-alist' and eventually end up in `font-lock-defaults'. Each entry in LIST should be a cons pair as expected by `font-lock-defaults'. The function also triggers Font Lock to recognize the change." - (set (make-local-variable 'font-latex-syntax-alist) - (append font-latex-syntax-alist list)) + (setq-local font-latex-syntax-alist + (append font-latex-syntax-alist list)) ;; We modify the `font-lock-syntax-table' directly but also call ;; `font-latex-setup' in order to have `font-lock-defaults' be in sync. (font-latex-setup) @@ -1321,7 +1321,7 @@ triggers Font Lock to recognize the change." (font-latex-set-syntactic-keywords) ;; Activate multi-line fontification facilities. - (set (make-local-variable 'font-lock-multiline) t) + (setq-local font-lock-multiline t) ;; The test for `major-mode' currently only works with docTeX mode ;; because `TeX-install-font-lock' is called explicitly in
master e0b0e733 01/10: Prefer `setq-local' in tex.el
branch: master commit e0b0e73372d0b44ad3ece0bdf036dbb8ecb14f45 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in tex.el * tex.el (TeX-bibtex-set-BibTeX-dialect, TeX-mode) (TeX-run-command, TeX-run-interactive, TeX-output-mode): Prefer `setq-local' over `set' and `make-local-variable' combination. --- tex.el | 38 ++ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/tex.el b/tex.el index 708ccfca..55f592df 100644 --- a/tex.el +++ b/tex.el @@ -2858,7 +2858,7 @@ side effect for example on variable `TeX-font-list'.") (defun TeX-bibtex-set-BibTeX-dialect () "Set `TeX-style-hook-dialect' to `:bibtex' locally to BibTeX buffers." - (set (make-local-variable 'TeX-style-hook-dialect) :bibtex)) + (setq-local TeX-style-hook-dialect :bibtex)) (defun TeX-load-style (style) "Search for and load each definition for STYLE in `TeX-style-path'." @@ -3818,30 +3818,29 @@ Not intended for direct use for user." (setq indent-tabs-mode nil) ;; Ispell support - (set (make-local-variable 'ispell-parser) 'tex) + (setq-local ispell-parser 'tex) ;; Redefine some standard variables (make-local-variable 'paragraph-start) (make-local-variable 'paragraph-separate) - (set (make-local-variable 'comment-start) "%") - (set (make-local-variable 'comment-start-skip) - (concat -"\\(\\(^\\|[^\\\n]\\)\\(" -(regexp-quote TeX-esc) -(regexp-quote TeX-esc) -"\\)*\\)\\(%+[ \t]*\\)")) - (set (make-local-variable 'comment-end-skip) "[ \t]*\\(\\s>\\|\n\\)") - (set (make-local-variable 'comment-use-syntax) t) - (set (make-local-variable 'comment-padding) " ") + (setq-local comment-start "%") + (setq-local comment-start-skip + (concat "\\(\\(^\\|[^\\\n]\\)\\(" + (regexp-quote TeX-esc) + (regexp-quote TeX-esc) + "\\)*\\)\\(%+[ \t]*\\)")) + (setq-local comment-end-skip "[ \t]*\\(\\s>\\|\n\\)") + (setq-local comment-use-syntax t) + (setq-local comment-padding " ") ;; Removed as commenting in (La)TeX is done with one `%' not two ;; (make-local-variable 'comment-add) ;; (setq comment-add 1) ;default to `%%' in comment-region - (set (make-local-variable 'comment-indent-function) #'TeX-comment-indent) - (set (make-local-variable 'comment-multi-line) nil) + (setq-local comment-indent-function #'TeX-comment-indent) + (setq-local comment-multi-line nil) (make-local-variable 'compile-command) (unless (boundp 'compile-command) (setq compile-command "make")) - (set (make-local-variable 'words-include-escapes) nil) + (setq-local words-include-escapes nil) ;; Make TAB stand out ;; (make-local-variable 'buffer-display-table) @@ -8031,9 +8030,9 @@ Return the new process." (set-buffer buffer) (buffer-disable-undo) (erase-buffer) -(set (make-local-variable 'line-number-display-limit) 0) +(setq-local line-number-display-limit 0) (setq TeX-output-extension nil) -(set (make-local-variable 'TeX-command-buffer) command-buff) +(setq-local TeX-command-buffer command-buff) (if dir (cd dir)) (insert "Running `" name "' on `" file "' with ``" command "''\n") (TeX-output-mode) @@ -8310,7 +8309,7 @@ Error parsing on \\[next-error] should work with a bit of luck." (setq-default TeX-command-buffer command-buff) (with-output-to-temp-buffer buffer) (set-buffer buffer) -(set (make-local-variable 'TeX-command-buffer) command-buff) +(setq-local TeX-command-buffer command-buff) (setq buffer-read-only nil) (if dir (cd dir)) (insert "Running `" name "' on `" file "' with ``" command "''\n") @@ -10453,8 +10452,7 @@ warnings and bad boxes" "Major mode for viewing TeX output. \\{TeX-output-mode-map} " :syntax-table nil :abbrev-table nil :interactive nil - (set (make-local-variable 'revert-buffer-function) - #'TeX-output-revert-buffer) + (setq-local revert-buffer-function #'TeX-output-revert-buffer) ;; special-mode makes it read-only which prevents input from TeX. (setq buffer-read-only nil))
master f52eeb28 10/10: Prefer `setq-local' in toolbar-x.el
branch: master commit f52eeb28eaed4690761ffa7982751d6b4589f7b9 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in toolbar-x.el * toolbar-x.el (toolbarx-install-toolbar): Prefer `setq-local' over `set' and `make-local-variable' combination. --- toolbar-x.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolbar-x.el b/toolbar-x.el index 72a3403f..b1e8ec30 100644 --- a/toolbar-x.el +++ b/toolbar-x.el @@ -1433,8 +1433,7 @@ line of buttons. The only property supported for this button is (if global-flag (setq-default toolbarx-internal-button-switches switches) - (set (make-local-variable 'toolbarx-internal-button-switches) - switches) + (setq-local toolbarx-internal-button-switches switches) (make-local-variable 'tool-bar-map))) (toolbarx-refresh global-flag))
master 6982a218 07/10: Prefer `setq-local' in tex-info.el
branch: master commit 6982a218a717c7db2ab494a7ea83dc821fd250e2 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in tex-info.el * tex-info.el (Texinfo-mode): Prefer `setq-local' over `set' and `make-local-variable' combination. --- tex-info.el | 52 +--- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/tex-info.el b/tex-info.el index 2a65c3a9..dc69762e 100644 --- a/tex-info.el +++ b/tex-info.el @@ -495,7 +495,7 @@ is assumed by default." (cons (car x) (- (cadr x))) (cons (car x) (cadr x texinfo-section-list -(set (make-local-variable (car v) ) (cdr v))) +(set (make-local-variable (car v)) (cdr v))) (reftex-ensure-compiled-variables)) ;;; Keymap: @@ -648,26 +648,25 @@ value of `Texinfo-mode-hook'." ;; "^@node [ \t]*[Tt]op\\|^@\\(" ;; texinfo-chapter-level-regexp ;; "\\)")) - (set (make-local-variable 'require-final-newline) mode-require-final-newline) - (set (make-local-variable 'indent-tabs-mode) nil) - (set (make-local-variable 'paragraph-separate) - (concat "@[a-zA-Z]*[ \n]\\|" paragraph-separate)) - (set (make-local-variable 'paragraph-start) - (concat "@[a-zA-Z]*[ \n]\\|" paragraph-start)) - (set (make-local-variable 'fill-column) 72) - (set (make-local-variable 'comment-start) "@c ") - (set (make-local-variable 'comment-start-skip) "@c +\\|@comment +") - (set (make-local-variable 'comment-use-syntax) nil) + (setq-local require-final-newline mode-require-final-newline) + (setq-local indent-tabs-mode nil) + (setq-local paragraph-separate + (concat "@[a-zA-Z]*[ \n]\\|" paragraph-separate)) + (setq-local paragraph-start + (concat "@[a-zA-Z]*[ \n]\\|" paragraph-start)) + (setq-local fill-column 72) + (setq-local comment-start "@c ") + (setq-local comment-start-skip "@c +\\|@comment +") + (setq-local comment-use-syntax nil) (setq TeX-comment-start-regexp "@c\\(?:omment\\)?\\>") - (set (make-local-variable 'words-include-escapes) t) - (set (make-local-variable 'imenu-generic-expression) - texinfo-imenu-generic-expression) + (setq-local words-include-escapes t) + (setq-local imenu-generic-expression texinfo-imenu-generic-expression) (setq imenu-case-fold-search nil) - (set (make-local-variable 'font-lock-defaults) - '(texinfo-font-lock-keywords nil nil nil backward-paragraph)) - (set (make-local-variable 'syntax-propertize-function) - texinfo-syntax-propertize-function) + (setq-local font-lock-defaults + '(texinfo-font-lock-keywords nil nil nil backward-paragraph)) + (setq-local syntax-propertize-function + texinfo-syntax-propertize-function) (setq-local outline-heading-alist (mapcar (lambda (x) (cons (concat "@" (car x)) (cadr x))) @@ -677,12 +676,12 @@ value of `Texinfo-mode-hook'." "\\>")) ;; Mostly AUCTeX stuff - (set (make-local-variable 'TeX-command-current) #'TeX-command-master) + (setq-local TeX-command-current #'TeX-command-master) (setq TeX-default-extension "texi") - (set (make-local-variable 'TeX-esc) "@") + (setq-local TeX-esc "@") - (set (make-local-variable 'TeX-auto-regexp-list) 'TeX-auto-empty-regexp-list) + (setq-local TeX-auto-regexp-list 'TeX-auto-empty-regexp-list) (setq TeX-command-default "TeX") (setq TeX-header-end (regexp-quote "%**end of header")) @@ -694,10 +693,9 @@ value of `Texinfo-mode-hook'." ;; (list (list "@\\([a-zA-Z]*\\)" 1 #'TeX-symbol-list-filtered nil) ;;(list "" TeX-complete-word))) - (set (make-local-variable 'TeX-font-list) Texinfo-font-list) - (set (make-local-variable 'TeX-font-replace-function) - #'TeX-font-replace-macro) - (set (make-local-variable 'TeX-style-hook-dialect) :texinfo) + (setq-local TeX-font-list Texinfo-font-list) + (setq-local TeX-font-replace-function #'TeX-font-replace-macro) + (setq-local TeX-style-hook-dialect :texinfo) (add-hook 'find-file-hook (lambda () (unless (file-exists-p (TeX-buffer-file-name)) @@ -706,8 +704,8 @@ value of `Texinfo-mode-hook'." (when (and (boundp 'add-log-current-defun-function) (fboundp 'texinfo-current-defun-name)) -(set (make-local-variable 'add-log-current-defun-function) - #'texinfo-current-defun-name)) +(setq-local add-log-current-defun-function +#'texinfo-current-defun-name)) (TeX-add-symbols '("acronym" "Acronym")
master 7463a646 03/10: Prefer `setq-local' in context.el
branch: master commit 7463a6464cd1afd957b4269cd8ccff6634cdc8a8 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in context.el * context.el (ConTeXt-mode-common-initialization): Prefer `setq-local' over `set' and `make-local-variable' combination. --- context.el | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/context.el b/context.el index abe11019..84035b31 100644 --- a/context.el +++ b/context.el @@ -1874,7 +1874,7 @@ that is, you do _not_ have to cater for this yourself by adding \\=' or $." "Initialization code that is common for all ConTeXt interfaces." (plain-TeX-common-initialization) - (set (make-local-variable 'TeX-style-hook-dialect) ConTeXt-dialect) + (setq-local TeX-style-hook-dialect ConTeXt-dialect) (require (intern (concat "context-" ConTeXt-current-interface))) (dolist (symbol ConTeXt-language-variable-list) @@ -1891,17 +1891,17 @@ that is, you do _not_ have to cater for this yourself by adding \\=' or $." (setq ConTeXt-largest-level 2)) ;; Indenting - (set (make-local-variable 'indent-line-function) #'ConTeXt-indent-line) - (set (make-local-variable 'fill-indent-according-to-mode) t) + (setq-local indent-line-function #'ConTeXt-indent-line) + (setq-local fill-indent-according-to-mode t) ;; Paragraph formatting - (set (make-local-variable 'LaTeX-syntactic-comments) nil) + (setq-local LaTeX-syntactic-comments nil) ;; Moved after `run-mode-hooks'. (bug#65750) ;; (set (make-local-variable 'LaTeX-paragraph-commands-regexp) ;; (ConTeXt-paragraph-commands-regexp)) - (set (make-local-variable 'paragraph-ignore-fill-prefix) t) - (set (make-local-variable 'fill-paragraph-function) #'LaTeX-fill-paragraph) - (set (make-local-variable 'adaptive-fill-mode) nil) + (setq-local paragraph-ignore-fill-prefix t) + (setq-local fill-paragraph-function #'LaTeX-fill-paragraph) + (setq-local adaptive-fill-mode nil) ;; Moved after `run-mode-hooks'. (bug#65750) ;; (setq paragraph-start ;; (concat @@ -1926,18 +1926,18 @@ that is, you do _not_ have to cater for this yourself by adding \\=' or $." ;; Outline support (require 'outline) - (set (make-local-variable 'outline-level) #'ConTeXt-outline-level) - (set (make-local-variable 'outline-regexp) (ConTeXt-outline-regexp t)) + (setq-local outline-level #'ConTeXt-outline-level) + (setq-local outline-regexp (ConTeXt-outline-regexp t)) (make-local-variable 'outline-heading-end-regexp) (setq TeX-header-end (ConTeXt-header-end) TeX-trailer-start (ConTeXt-trailer-start)) ;; font switch support - (set (make-local-variable 'TeX-font-list) ConTeXt-font-list) + (setq-local TeX-font-list ConTeXt-font-list) ;; imenu support - (set (make-local-variable 'imenu-create-index-function) - #'ConTeXt-imenu-create-index-function) + (setq-local imenu-create-index-function + #'ConTeXt-imenu-create-index-function) (setq TeX-command-default "ConTeXt") (setq TeX-sentinel-default-function #'TeX-ConTeXt-sentinel))
master e86f8603 08/10: Prefer `setq-local' in bib-cite.el
branch: master commit e86f8603293a52a6cb605707a03bc0170d01bea6 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in bib-cite.el * bib-cite.el (bib-cite-minor-mode) (bib-cite-setup-highlight-mouse-keymap, bib-etags): Prefer `setq-local' over `set' and `make-local-variable' combination. --- bib-cite.el | 40 +--- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/bib-cite.el b/bib-cite.el index 5a09a8d6..5a9f6f83 100644 --- a/bib-cite.el +++ b/bib-cite.el @@ -1,6 +1,6 @@ ;; bib-cite.el - Display \cite, \ref or \label / Extract refs from BiBTeX file. -*- lexical-binding: t; -*- -;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2022 Free Software Foundation, Inc. +;; Copyright (C) 1994-1999, 2001, 2003-2005, 2014-2024 Free Software Foundation, Inc. ;; Author:Peter S. Galbraith ;; Maintainer: auctex-devel@gnu.org @@ -725,17 +725,17 @@ When bib-cite mode is enabled, citations, labels and refs are highlighted when the mouse is over them. Clicking on these highlights with [mouse-2] runs `bib-find', and [mouse-3] runs `bib-display'." (interactive "P") - (set (make-local-variable 'bib-cite-minor-mode) - (if arg - (> (prefix-numeric-value arg) 0) - (not bib-cite-minor-mode))) + (setq-local bib-cite-minor-mode + (if arg + (> (prefix-numeric-value arg) 0) +(not bib-cite-minor-mode))) (cond (bib-cite-minor-mode ;Setup the minor-mode ;; Christoph Wedler's suggestion for xemacs ;; Added for version 2.19 (if (boundp 'tags-always-exact) (progn - (set (make-local-variable 'tags-always-exact) nil))) + (setq-local tags-always-exact nil))) ;; mouse overlay (if bib-highlight-mouse-t (progn @@ -758,17 +758,19 @@ runs `bib-find', and [mouse-3] runs `bib-display'." ;; own. (defun bib-cite-setup-highlight-mouse-keymap () "Set up the bib-cite text in the current buffer to be clickable." - (set (make-local-variable 'bib-highlight-mouse-keymap) - ;; First, copy the local keymap so we don't have `disappearing' menus - ;; when the mouse is moved over a \ref, \label or \cite command. - - ;; FIXME: Check out (mouse-major-mode-menu) to see how it grabs the local - ;;menus to display. Maybe on `highlighted' commands we could - ;;only display the bib-cite stuff (or a subset of it). - (let ((m (copy-keymap (current-local-map - (define-key m [down-mouse-3] #'bib-display-mouse) - (define-key m [mouse-2] #'bib-find-mouse) - m))) + (setq-local bib-highlight-mouse-keymap + ;; First, copy the local keymap so we don't have + ;; `disappearing' menus when the mouse is moved over a + ;; \ref, \label or \cite command. + + ;; FIXME: Check out (mouse-major-mode-menu) to see how it + ;;grabs the local menus to display. Maybe on + ;;`highlighted' commands we could only display the + ;;bib-cite stuff (or a subset of it). + (let ((m (copy-keymap (current-local-map +(define-key m [down-mouse-3] #'bib-display-mouse) +(define-key m [mouse-2] #'bib-find-mouse) +m))) ;;;###autoload (defun turn-on-bib-cite () @@ -1160,7 +1162,7 @@ See variables `bib-etags-command' and `bib-etags-filename'." (or (equal the-tags-file tags-file-name) ;make sure it's current (visit-tags-table the-tags-file)) -;(set (make-local-variable 'tags-file-name) the-tags-file)) +;; (set (make-local-variable 'tags-file-name) the-tags-file)) ;; above should not be needed ;; Weird Bug: @@ -1172,7 +1174,7 @@ See variables `bib-etags-command' and `bib-etags-filename'." ;; (Changed by Anders Stenman) (if (get-file-buffer the-tags-file) (with-current-buffer (get-file-buffer the-tags-file) - (set (make-local-variable 'tags-file-name) the-tags-file + (setq-local tags-file-name the-tags-file (if bib-document-TeX-files-warnings ;free variable loose in emacs!
master 581a6610 09/10: Prefer `setq-local' in tex-wizard.el
branch: master commit 581a66104c04c78fa185cc1059f770b2e68a9ab0 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in tex-wizard.el * tex-wizard.el (TeX-wizard): Prefer `setq-local' over `set' and `make-local-variable' combination. --- tex-wizard.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex-wizard.el b/tex-wizard.el index d0d0c24d..bb6e3080 100644 --- a/tex-wizard.el +++ b/tex-wizard.el @@ -100,7 +100,7 @@ It appears that RefTeX is not configured to cooperate with AUCTeX. Please configure it using the menus, save for future sessions, then press the finish button.") (customize-variable-other-window 'reftex-plug-into-AUCTeX) -(set (make-local-variable 'custom-buffer-done-kill) t) +(setq-local custom-buffer-done-kill t) (add-hook 'kill-buffer-hook #'exit-recursive-edit nil t) (recursive-edit) (select-window wizwin)
master updated (01e0d2c8 -> f52eeb28)
esbati pushed a change to branch master. from 01e0d2c8 Use `setq-local' new e0b0e733 Prefer `setq-local' in tex.el new a1fb4547 Prefer `setq-local' in latex.el new 7463a646 Prefer `setq-local' in context.el new e0fb3413 Prefer `setq-local' in font-latex.el new fe63a90c Prefer `setq-local' in tex-font.el new 5e0db640 Prefer `setq-local' in plain-tex.el new 6982a218 Prefer `setq-local' in tex-info.el new e86f8603 Prefer `setq-local' in bib-cite.el new 581a6610 Prefer `setq-local' in tex-wizard.el new f52eeb28 Prefer `setq-local' in toolbar-x.el Summary of changes: bib-cite.el | 40 +--- context.el| 24 font-latex.el | 6 +++--- latex.el | 46 ++ plain-tex.el | 2 +- tex-font.el | 25 - tex-info.el | 52 +--- tex-wizard.el | 2 +- tex.el| 38 ++ toolbar-x.el | 3 +-- 10 files changed, 116 insertions(+), 122 deletions(-)
master fe63a90c 05/10: Prefer `setq-local' in tex-font.el
branch: master commit fe63a90ccda1523f23d7ca5bcee7b7eeab84db37 Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in tex-font.el * tex-font.el (tex-font-setup): Prefer `setq-local' over `set' and `make-local-variable' combination. --- tex-font.el | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/tex-font.el b/tex-font.el index 5f483d86..5158c52e 100644 --- a/tex-font.el +++ b/tex-font.el @@ -1,18 +1,18 @@ ;;; tex-font.el --- Font-Lock support stolen from Emacs 21. -*- lexical-binding: t; -*- ;; -;; Copyright (C) 1985-2021 Free Software Foundation, Inc. +;; Copyright (C) 1985-2024 Free Software Foundation, Inc. ;; Maintainer: auctex-devel@gnu.org ;; Keywords: tex, faces -;; This file is part of AUC TeX. +;; This file is part of AUCTeX. -;; AUC TeX is free software; you can redistribute it and/or modify +;; 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. -;; AUC TeX is distributed in the hope that it will be useful, +;; 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. @@ -159,15 +159,14 @@ ;;;###autoload (defun tex-font-setup () "Setup font lock support for TeX." - (set (make-local-variable 'font-lock-defaults) - '((tex-font-lock-keywords - tex-font-lock-keywords-1 tex-font-lock-keywords-2) - nil nil ((?$ . "\"")) nil - ;; Who ever uses that anyway ??? - (font-lock-mark-block-function . mark-paragraph) - (font-lock-syntactic-face-function - . tex-font-lock-syntactic-face-function))) - ) + (setq-local font-lock-defaults + '((tex-font-lock-keywords + tex-font-lock-keywords-1 tex-font-lock-keywords-2) +nil nil ((?$ . "\"")) nil +;; Who ever uses that anyway ??? +(font-lock-mark-block-function . mark-paragraph) +(font-lock-syntactic-face-function + . tex-font-lock-syntactic-face-function (provide 'tex-font)
master a1fb4547 02/10: Prefer `setq-local' in latex.el
branch: master commit a1fb454702423b3d81910bbe9b26ec929bd25a5a Author: Arash Esbati Commit: Arash Esbati Prefer `setq-local' in latex.el * latex.el (BibTeX-auto-store, docTeX-mode) (LaTeX-common-initialization): Prefer `setq-local' over `set' and `make-local-variable' combination. --- latex.el | 46 ++ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/latex.el b/latex.el index 1fa7cc2f..b9014668 100644 --- a/latex.el +++ b/latex.el @@ -2324,10 +2324,10 @@ It will setup BibTeX to store keys in an auto file." ;; add it before we enter BibTeX mode the first time. (add-hook 'write-contents-functions #'TeX-safe-auto-write nil t) (TeX-bibtex-set-BibTeX-dialect) - (set (make-local-variable 'TeX-auto-untabify) nil) - (set (make-local-variable 'TeX-auto-parse-length) 99) - (set (make-local-variable 'TeX-auto-regexp-list) BibTeX-auto-regexp-list) - (set (make-local-variable 'TeX-master) t)) + (setq-local TeX-auto-untabify nil) + (setq-local TeX-auto-parse-length 99) + (setq-local TeX-auto-regexp-list BibTeX-auto-regexp-list) + (setq-local TeX-master t)) ;;; Macro Argument Hooks @@ -8331,8 +8331,8 @@ Run after mode hooks and file local variables application." "Major mode in AUCTeX for editing .dtx files derived from `LaTeX-mode'. Runs `LaTeX-mode', sets a few variables and runs the hooks in `docTeX-mode-hook'." - (set (make-local-variable 'LaTeX-insert-into-comments) t) - (set (make-local-variable 'LaTeX-syntactic-comments) t) + (setq-local LaTeX-insert-into-comments t) + (setq-local LaTeX-syntactic-comments t) (setq TeX-default-extension docTeX-default-extension) ;; Make filling and indentation aware of DocStrip guards. (setq paragraph-start (concat paragraph-start "\\|%<") @@ -8398,12 +8398,12 @@ function would return non-nil and `(match-string 1)' would return (defun LaTeX-common-initialization () "Common initialization for LaTeX derived modes." - (set (make-local-variable 'indent-line-function) #'LaTeX-indent-line) + (setq-local indent-line-function #'LaTeX-indent-line) ;; Filling - (set (make-local-variable 'paragraph-ignore-fill-prefix) t) - (set (make-local-variable 'fill-paragraph-function) #'LaTeX-fill-paragraph) - (set (make-local-variable 'adaptive-fill-mode) nil) + (setq-local paragraph-ignore-fill-prefix t) + (setq-local fill-paragraph-function #'LaTeX-fill-paragraph) + (setq-local adaptive-fill-mode nil) ;; Cater for \verb|...| (and similar) contructs which should not be ;; broken. (add-to-list (make-local-variable 'fill-nobreak-predicate) @@ -8414,11 +8414,11 @@ function would return non-nil and `(match-string 1)' would return (setq TeX-header-end LaTeX-header-end TeX-trailer-start LaTeX-trailer-start) - (set (make-local-variable 'TeX-style-hook-dialect) TeX-dialect) + (setq-local TeX-style-hook-dialect TeX-dialect) (require 'outline) - (set (make-local-variable 'outline-level) #'LaTeX-outline-level) - (set (make-local-variable 'outline-regexp) (LaTeX-outline-regexp t)) + (setq-local outline-level #'LaTeX-outline-level) + (setq-local outline-regexp (LaTeX-outline-regexp t)) (when (boundp 'outline-heading-alist) (setq outline-heading-alist (mapcar (lambda (x) @@ -8443,8 +8443,7 @@ function would return non-nil and `(match-string 1)' would return (setq TeX-verbatim-p-function #'LaTeX-verbatim-p) (setq TeX-search-forward-comment-start-function #'LaTeX-search-forward-comment-start) - (set (make-local-variable 'TeX-search-files-type-alist) - LaTeX-search-files-type-alist) + (setq-local TeX-search-files-type-alist LaTeX-search-files-type-alist) (setq-local beginning-of-defun-function #'LaTeX-find-matching-begin) (setq-local end-of-defun-function #'LaTeX-find-matching-end) @@ -8457,11 +8456,11 @@ function would return non-nil and `(match-string 1)' would return (add-hook 'completion-at-point-functions #'LaTeX--arguments-completion-at-point 5 t) - (set (make-local-variable 'LaTeX-item-list) '(("description" . LaTeX-item-argument) -("thebibliography" . LaTeX-item-bib) -("array" . LaTeX-item-array) -("tabular" . LaTeX-item-array) -("tabular*" . LaTeX-item-tabular*))) + (setq-local LaTeX-item-list '(("description" . LaTeX-item-argument) +("thebibliography" . LaTeX-item-bib) +("array" . LaTeX-item-array) +("tabular" . LaTeX-item-array) +("tabular*" . LaTeX-item-tabular*))) (LaTeX-a
Re: CTAN update
Hi Keita, Ikumi Keita writes: > I see. Then I'm fine with your idea. :-) Thanks, I installed that change. Do you think we have enough changes for a 14.0.6 ELPA release? I would upload a preview tarball release to CTAN as well. Best, Arash
main a7f2e25f: Create CTAN release tarball for preview
branch: main commit a7f2e25f8f83bc2180f060f74d367f817a4474ed Author: Arash Esbati Commit: Arash Esbati Create CTAN release tarball for preview * GNUmakefile (preview-ctan): Add new rule for making a tarball for CTAN release of preview package. --- GNUmakefile | 29 + 1 file changed, 29 insertions(+) diff --git a/GNUmakefile b/GNUmakefile index 617daea1..dd969698 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,6 +22,7 @@ EMACS=$(EMACSBIN) --batch -q -no-site-file -no-init-file -l lpath.el MAKEINFO=makeinfo INSTALL_INFO=install-info PERL=perl +PDFLATEX=pdfla$(TEX) MANUALS=auctex preview-latex INFO_FILES=$(MANUALS:=.info) @@ -82,6 +83,10 @@ elpa: $(MAIN_GENERATED_FILES) ChangeLog clean: rm -f $(ALL_GENERATED_FILES) \ $(wildcard *.elc style/*.elc) \ + $(LATEX_FILES) \ + $(wildcard latex/*.aux latex/*.drv latex/*.hd latex/*.log) \ + $(wildcard latex/*.out latex/*.pdf latex/*.tar.gz) \ + latex/preview-mk.ins latex/preview.ins \ auctex-autoloads.el \ $(DYNVARSFILES) @@ -137,6 +142,30 @@ $(LATEX_FILES): latex/preview.dtx latex/bootstrap.ins cd latex; $(TEX) '\nonstopmode \input bootstrap.ins' cd latex; $(TEX) '\nonstopmode \input preview-mk.ins' +# The next rules are copied from Makefile.in and +# latex/Makefile.in. `preview-ctan' is the rule needed for creating a +# tarball for CTAN upload. +preview.ins: latex/preview.dtx + cd latex && rm -f $@ && \ + $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \ + '\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \ + '\endbatchfile' + +preview.pdf: latex/preview.dtx latex/preview.sty + cd latex && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' + +preview-ctan: $(LATEX_FILES) preview.ins preview.pdf + cd latex && \ + mkdir -p preview && \ + cp README preview.dtx preview.ins preview.pdf preview/ && \ + tar -cz --owner=root --group=root -f preview.tar.gz preview/ && \ + rm -rf preview/ + +# Cross-file variable checking with lexical binding +# https://www.gnu.org/software/emacs/manual/html_node/elisp/Converting-to-Lexical-Binding.html DYNVARSFILES = *.dynvars style/*.dynvars auctex-dynvars dynvars-check: rm -f $(wildcard *.elc) $(wildcard style/*.elc) $(DYNVARSFILES)
master 01e0d2c8: Use `setq-local'
branch: master commit 01e0d2c8ef9d7d985533c6ae40e696782443b2f4 Author: Arash Esbati Commit: Arash Esbati Use `setq-local' * style/amsmath.el ("amsmath"): * style/appendix.el ("appendix"): * style/array.el (LaTeX-array-update-column-letters, "array"): * style/beamer.el (LaTeX-beamer-themes-list) (LaTeX-beamer-inner-themes-list, LaTeX-beamer-outer-themes-list) (LaTeX-beamer-color-themes-list, LaTeX-beamer-font-themes-list): * style/dcolumn.el ("dcolumn"): * style/epigraph.el ("epigraph"): * style/exam.el ("exam"): * style/hyperref.el ("hyperref"): * style/l3doc.el ("l3doc"): * style/ltugboat.el ("ltugboat"): * style/plext.el ("plext"): * style/siunitx.el ("siunitx"): * style/tabularx.el ("tabularx"): * style/tabulary.el ("tabulary"): * style/tcolorboxlib-raster.el ("tcolorboxlib-raster"): * style/tex-live.el ("tex-live"): Prefer `setq-local' over `set' and `make-local-variable' combination. --- style/amsmath.el | 17 - style/appendix.el| 7 --- style/array.el | 14 +++--- style/beamer.el | 21 ++--- style/dcolumn.el | 6 +++--- style/epigraph.el| 11 +-- style/exam.el| 19 +-- style/hyperref.el| 13 ++--- style/l3doc.el | 8 style/ltugboat.el| 4 ++-- style/plext.el | 13 +++-- style/siunitx.el | 6 +++--- style/tabularx.el| 6 +++--- style/tabulary.el| 6 +++--- style/tcolorboxlib-raster.el | 11 +-- style/tex-live.el| 6 +++--- 16 files changed, 82 insertions(+), 86 deletions(-) diff --git a/style/amsmath.el b/style/amsmath.el index f72f8be8..ff0ebc9c 100644 --- a/style/amsmath.el +++ b/style/amsmath.el @@ -1,7 +1,6 @@ ;;; amsmath.el --- Style hook for the AMS-LaTeX amsmath package. -*- lexical-binding: t; -*- -;; Copyright (C) 2002, 2005-2007, 2012-2014, 2017-2020, 2022 -;; Free Software Foundation, Inc. +;; Copyright (C) 2002--2024 Free Software Foundation, Inc. ;; FIXME: What about the copyright for <= 2001? ;; Author: Carsten Dominik @@ -153,13 +152,13 @@ ("flalign". LaTeX-amsmath-label) ("gather" . LaTeX-amsmath-label - (set (make-local-variable 'TeX-braces-association) -(append '(("\\lvert" . "\\rvert") - ("\\lVert" . "\\rVert")) -TeX-braces-association)) - (set (make-local-variable 'TeX-left-right-braces) -(append '(("\\lvert") ("\\rvert") ("\\lVert") ("\\rVert")) -TeX-left-right-braces)) + (setq-local TeX-braces-association + (append '(("\\lvert" . "\\rvert") + ("\\lVert" . "\\rVert")) + TeX-braces-association)) + (setq-local TeX-left-right-braces + (append '(("\\lvert") ("\\rvert") ("\\lVert") ("\\rVert")) + TeX-left-right-braces)) ;; amsmath includes amstext, amsbsy, & amsopn. ;; So we run their hooks, too. diff --git a/style/appendix.el b/style/appendix.el index 406aef5f..9912f3ce 100644 --- a/style/appendix.el +++ b/style/appendix.el @@ -1,6 +1,6 @@ ;;; appendix.el --- AUCTeX style for `appendix.sty' (v1.2c) -*- lexical-binding: t; -*- -;; Copyright (C) 2020 Free Software Foundation, Inc. +;; Copyright (C) 2020--2024 Free Software Foundation, Inc. ;; Author: Arash Esbati ;; Maintainer: auctex-devel@gnu.org @@ -68,8 +68,9 @@ ;; Don't indent the content inside \(sub\)?appendices environments: (unless (string-match "appendices" LaTeX-document-regexp) - (set (make-local-variable 'LaTeX-document-regexp) - (concat LaTeX-document-regexp "\\|\\(?:sub\\)?appendices" + (setq-local LaTeX-document-regexp + (concat LaTeX-document-regexp + "\\|\\(?:sub\\)?appendices" TeX-dialect) (defvar LaTeX-appendix-package-options '("toc" "page" "title" diff --git a/style/array.el b/style/array.el index 001044ec..3d995aae 100644 --- a/style/array.el +++ b/style/array.el @@ -1,6 +1,6 @@ ;;; array.el --- AUCTeX style for `array.sty' -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2022 Free Software Foundation, Inc. +;; Copyright (C) 2013-2024 Free Software Foundation, Inc. ;; Author: Mads Jensen ;; Maintainer: auctex-devel@gnu.org @@ -57,10 +57,10 @@ package.") (defun LaTeX-array-update-colu
Re: CTAN update
Hi Keita, Ikumi Keita writes: > It seems that the new targets don't have expected dependencies. For > example, type "make preview-mk.ins" and "make preview.drv" in > succession. The second "make" re-runs > cd latex && $(TEX) '\nonstopmode \input bootstrap.ins' > , which is redundant. Yes, I didn't pay attention to that a lot. > In order to write the dependency rules reliably and simply, I think we > should have another GNUmakefile in latex subdirectory and put the > relavant rules in it. Having a second GNUmakefile in latex/ is something that I'm trying to avoid; I hope we manage to clean up the one top level and then be done with it. I can think of something like this; if you think it's not elegant, I could get rid of preview.ins and preview.pdf by moving the whole thing into preview-ctan. --8<---cut here---start->8--- diff --git a/GNUmakefile b/GNUmakefile index 617daea1..dd969698 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,6 +22,7 @@ EMACS=$(EMACSBIN) --batch -q -no-site-file -no-init-file -l lpath.el MAKEINFO=makeinfo INSTALL_INFO=install-info PERL=perl +PDFLATEX=pdfla$(TEX) MANUALS=auctex preview-latex INFO_FILES=$(MANUALS:=.info) @@ -82,6 +83,10 @@ elpa: $(MAIN_GENERATED_FILES) ChangeLog clean: rm -f $(ALL_GENERATED_FILES) \ $(wildcard *.elc style/*.elc) \ + $(LATEX_FILES) \ + $(wildcard latex/*.aux latex/*.drv latex/*.hd latex/*.log) \ + $(wildcard latex/*.out latex/*.pdf latex/*.tar.gz) \ + latex/preview-mk.ins latex/preview.ins \ auctex-autoloads.el \ $(DYNVARSFILES) @@ -137,6 +142,30 @@ $(LATEX_FILES): latex/preview.dtx latex/bootstrap.ins cd latex; $(TEX) '\nonstopmode \input bootstrap.ins' cd latex; $(TEX) '\nonstopmode \input preview-mk.ins' +# The next rules are copied from Makefile.in and +# latex/Makefile.in. `preview-ctan' is the rule needed for creating a +# tarball for CTAN upload. +preview.ins: latex/preview.dtx + cd latex && rm -f $@ && \ + $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \ + '\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \ + '\endbatchfile' + +preview.pdf: latex/preview.dtx latex/preview.sty + cd latex && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' + +preview-ctan: $(LATEX_FILES) preview.ins preview.pdf + cd latex && \ + mkdir -p preview && \ + cp README preview.dtx preview.ins preview.pdf preview/ && \ + tar -cz --owner=root --group=root -f preview.tar.gz preview/ && \ + rm -rf preview/ + +# Cross-file variable checking with lexical binding +# https://www.gnu.org/software/emacs/manual/html_node/elisp/Converting-to-Lexical-Binding.html DYNVARSFILES = *.dynvars style/*.dynvars auctex-dynvars dynvars-check: rm -f $(wildcard *.elc) $(wildcard style/*.elc) $(DYNVARSFILES) --8<---cut here---end--->8--- Best, Arash
Re: CTAN update
Hi Keita, Ikumi Keita writes: > So I hope for our GNUmakefile, > preview.pdf: latex/preview.drv latex/preview.dtx latex/preview.sty > cd latex; \ > $(PDFLATEX) '\nonstopmode \input{preview.drv}'; \ > $(PDFLATEX) '\nonstopmode \input{preview.drv}'; \ > $(PDFLATEX) '\nonstopmode \input{preview.drv}' > would do the job. (I haven't tried actually, though. Maybe we also need > PDFLATEX=pdflatex > in GNUmakefile?) Thanks. I think it needed a little more massaging so I came up with this: --8<---cut here---start->8--- diff --git a/GNUmakefile b/GNUmakefile index 617daea1..c58398ae 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,6 +22,7 @@ EMACS=$(EMACSBIN) --batch -q -no-site-file -no-init-file -l lpath.el MAKEINFO=makeinfo INSTALL_INFO=install-info PERL=perl +PDFLATEX=pdfla$(TEX) MANUALS=auctex preview-latex INFO_FILES=$(MANUALS:=.info) @@ -82,6 +83,10 @@ elpa: $(MAIN_GENERATED_FILES) ChangeLog clean: rm -f $(ALL_GENERATED_FILES) \ $(wildcard *.elc style/*.elc) \ + $(LATEX_FILES) \ + $(wildcard latex/*.aux latex/*.drv latex/*.hd latex/*.log) \ + $(wildcard latex/*.out latex/*.pdf latex/*.tar.gz) \ + latex/preview-mk.ins latex/preview.ins \ auctex-autoloads.el \ $(DYNVARSFILES) @@ -137,6 +142,36 @@ $(LATEX_FILES): latex/preview.dtx latex/bootstrap.ins cd latex; $(TEX) '\nonstopmode \input bootstrap.ins' cd latex; $(TEX) '\nonstopmode \input preview-mk.ins' +# The next rules are copied from Makefile.in and +# latex/Makefile.in. `preview-ctan' is the rule needed for creating a +# tarball for CTAN upload. +preview.ins: latex/preview.dtx + cd latex && rm -f $@ && \ + $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \ + '\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \ + '\endbatchfile' + +preview-mk.ins: latex/preview.dtx latex/bootstrap.ins + cd latex && $(TEX) '\nonstopmode \input bootstrap.ins' + +preview.drv: latex/preview.dtx preview-mk.ins + cd latex && $(TEX) '\nonstopmode \input preview-mk.ins' + +preview.pdf: preview.drv latex/preview.dtx latex/preview.sty + cd latex && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' && \ + $(PDFLATEX) '\nonstopmode \input{preview.drv}' + +preview-ctan: preview.ins preview.pdf + cd latex && \ + mkdir -p preview && \ + cp README preview.dtx preview.ins preview.pdf preview/ && \ + tar -cz --owner=root --group=root -f preview.tar.gz preview/ && \ + rm -rf preview/ + +# Cross-file variable checking with lexical binding +# https://www.gnu.org/software/emacs/manual/html_node/elisp/Converting-to-Lexical-Binding.html DYNVARSFILES = *.dynvars style/*.dynvars auctex-dynvars dynvars-check: rm -f $(wildcard *.elc) $(wildcard style/*.elc) $(DYNVARSFILES) --8<---cut here---end--->8--- Now one can do 'make preview-ctan' and gets a tarball. Ugly is the suffix part in clean, but it works :-) WDYT? Best, Arash
Re: CTAN update (Re: bug#71690: 14.0.5; preview-latex clips bold text with inline equations)
Ikumi Keita writes: > Probably, yes. ELPA AUCTeX stores preview package under > ~/.emacs.d/elpa/auctex-x.y.z/latex and most users wouldn't add it to > kpathsea search path. Maybe we should release AUCTeX 14.0.6 and push a corresponding preview.dtx to CTAN? For that, we need some additions to GNUmakefile on the main branch, I think. A starting point can look like this: --8<---cut here---start->8--- diff --git a/GNUmakefile b/GNUmakefile index 617daea1..a7bb0dc9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -137,6 +137,18 @@ $(LATEX_FILES): latex/preview.dtx latex/bootstrap.ins cd latex; $(TEX) '\nonstopmode \input bootstrap.ins' cd latex; $(TEX) '\nonstopmode \input preview-mk.ins' +# Only for standalone preview.sty package: +preview.ins: latex/preview.dtx + cd latex; rm -f $@; \ + $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \ + '\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \ + '\endbatchfile' + +preview-ctan: preview.ins + cd latex; \ + tar -cz --owner=root --group=root \ + -f preview.tar.gz README preview.dtx preview.ins + DYNVARSFILES = *.dynvars style/*.dynvars auctex-dynvars dynvars-check: rm -f $(wildcard *.elc) $(wildcard style/*.elc) $(DYNVARSFILES) --8<---cut here---end--->8--- But we still need some rules in order to create the preview.pdf file which is required for a CTAN release, IIUC. I'll try to have a look, but wouldn't mind if someone more fluent in make could also check ;-) Best, Arash
master b0d45eb0: ; * NEWS.org: Update the file.
branch: master commit b0d45eb0dd9a97bd7444d0ee1494325ce6363d4d Author: Arash Esbati Commit: Arash Esbati ; * NEWS.org: Update the file. --- NEWS.org | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS.org b/NEWS.org index 2806126b..545adce2 100644 --- a/NEWS.org +++ b/NEWS.org @@ -11,7 +11,8 @@ ** Added - Complete support for in-buffer completion of color support macros. -- Add new support file =style/standalone.el=. +- Add new support files =style/contract.el=, =style/diagbox.el= and + =style/standalone.el=. ** Fixed @@ -47,6 +48,7 @@ - Delete obsolete variables ~TeX-symbol-marker~, ~TeX-symbol-marker-pos~, ~TeX-dollar-sign~, ~TeX-dollar-string~ and ~TeX-dollar-regexp~. +- Delete obsolete minor-mode ~TeX-Omega-mode~. * [14.0.5] - 2024-05-19
master 4978f1ac: * tex.el (TeX-Omega-mode): Delete obsolete minor-mode.
branch: master commit 4978f1ac4ee59ace595389872490061e5dbbdd0f Author: Arash Esbati Commit: Arash Esbati * tex.el (TeX-Omega-mode): Delete obsolete minor-mode. --- tex.el | 9 - 1 file changed, 9 deletions(-) diff --git a/tex.el b/tex.el index b3462d2b..0f6b753a 100644 --- a/tex.el +++ b/tex.el @@ -1660,15 +1660,6 @@ For available TYPEs, see variable `TeX-engine'." (setq TeX-PDF-from-DVI nil)) ((eq type 'omega) (TeX-PDF-mode 0 -(define-minor-mode TeX-Omega-mode - "Minor mode for using the Omega engine." - :init-value nil :lighter nil :keymap nil - :group 'TeX-command - (TeX-engine-set (if TeX-Omega-mode 'omega 'default))) -(defalias 'tex-omega-mode #'TeX-Omega-mode) -(make-obsolete 'TeX-Omega-mode #'TeX-engine-set "11.86") -(make-obsolete-variable 'TeX-Omega-mode 'TeX-engine "11.86") - ;;; Forward and inverse search (defcustom TeX-source-correlate-method
master dca039f9: ; * style/preview.el ("preview"): Improve fontification.
branch: master commit dca039f91cc0b3fa48e1da6a9a91b52c7d9dbca0 Author: Arash Esbati Commit: Arash Esbati ; * style/preview.el ("preview"): Improve fontification. --- style/preview.el | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/style/preview.el b/style/preview.el index 5431c095..c19d2783 100644 --- a/style/preview.el +++ b/style/preview.el @@ -1,6 +1,6 @@ ;;; preview.el --- AUCTeX style for `preview.sty' (v2010/02/14) -*- lexical-binding: t; -*- -;; Copyright (C) 2017, 2018, 2020 Free Software Foundation, Inc. +;; Copyright (C) 2017--2024 Free Software Foundation, Inc. ;; Author: Arash Esbati ;; Maintainer: auctex-devel@gnu.org @@ -64,23 +64,23 @@ OPTIONAL is ignored." (TeX-add-symbols '("PreviewMacro" (TeX-arg-conditional (y-or-n-p "With optional arguments? ") - ( [ t ] [ nil ] ) - ()) + ( [ t ] [ nil ] ) + ()) TeX-arg-macro) '("PreviewMacro*" (TeX-arg-conditional (y-or-n-p "With optional arguments? ") - ( [ t ] [ nil ] ) - ()) + ( [ t ] [ nil ] ) +()) TeX-arg-macro) '("PreviewEnvironment" (TeX-arg-conditional (y-or-n-p "With optional arguments? ") -( [ t ] [ nil ] ) -()) + ( [ t ] [ nil ] ) + ()) TeX-arg-environment) '("PreviewEnvironment*" (TeX-arg-conditional (y-or-n-p "With optional arguments? ") - ( [ t ] [ nil ] ) - ()) +( [ t ] [ nil ] ) + ()) TeX-arg-environment) '("PreviewSnarfEnvironment" TeX-arg-environment) @@ -93,7 +93,7 @@ OPTIONAL is ignored." ;; Fontification (when (and (featurep 'font-latex) (eq TeX-install-font-lock 'font-latex-setup)) - (font-latex-add-keywords '(("PreviewMacro""*[[{") + (font-latex-add-keywords '(("PreviewMacro""*[[|{\\") ("PreviewEnvironment" "*[[{") ("PreviewSnarfEnvironment" "[{")) 'function)))
Re: Deleting `TeX-Omega-mode'
Hi Keita, Ikumi Keita writes: > I don't mind it, but shouldn't we delete many other Omega related stuffs > (for example, "omega" entry in `TeX-engine-alist-builtin') as well? Thanks for your response. I wanted to delete the mode because it throws warnings when AUCTeX is installed from ELPA, so that is a quick fix. Getting rid of omega-engine is actually the next thing on the list. Best, Arash
master f606c46c: ; Improve style/contract.el
branch: master commit f606c46ccb78b04591bf86cf489bbb55a9af74a7 Author: Arash Esbati Commit: Arash Esbati ; Improve style/contract.el * style/contract.el ("contract"): Fix support for \DeclareNewJuraEnvironment macro. --- style/contract.el | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/style/contract.el b/style/contract.el index 898dd746..1bd90214 100644 --- a/style/contract.el +++ b/style/contract.el @@ -94,7 +94,8 @@ ("ClauseFont") ("SubClause") ("Sentence") -("ClauseNumberFormat"))]) +("ClauseNumberFormat"))] + 2) ;; 7 Support for Different Languages "parname" @@ -120,8 +121,9 @@ ;; Fontification (when (and (featurep 'font-latex) (eq TeX-install-font-lock 'font-latex-setup)) - (font-latex-add-keywords '(("contractSetup" "{") -("ellipsispar" "[")) + (font-latex-add-keywords '(("contractSetup" "{") +("ellipsispar" "[") +("DeclareNewJuraEnvironment" "{[{{")) 'function) (font-latex-add-keywords '(("Clause" "[")) 'sectioning-2)