Message ID | 60bfe771a930daaec6fd53a2a63fae7fbdb6ac38.1726194205.git.maxim.cournoyer@gmail.com |
---|---|
State | New |
Headers | show |
Series | [bug#73216,1/2] gnu: Add emacs-org-texlive-collection. | expand |
Am Freitag, dem 13.09.2024 um 11:23 +0900 schrieb Maxim Cournoyer: > * gnu/packages/emacs-xyz.scm (emacs-org-texlive-collection): New > variable. > > Change-Id: I4039e67f174d0440f351da6d11634f0ceea191cd > --- > gnu/packages/emacs-xyz.scm | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 7368589d7b..de42d9ebd9 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -31,7 +31,7 @@ > ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> > ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> > ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> > -;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023 Maxim > Cournoyer <maxim.cournoyer@gmail.com> > +;;; Copyright © 2017-2024 Maxim Cournoyer > <maxim.cournoyer@gmail.com> > ;;; Copyright © 2018 Sohom Bhattacharjee > <soham.bhattacharjee15@gmail.com> > ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> > ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt > <mail@ambrevar.xyz> > @@ -17655,6 +17655,29 @@ (define-public emacs-org-contrib > compatible with the Org stable version.") > (license license:gpl3+))) > > +(define-public emacs-org-texlive-collection > + (package > + (inherit emacs-org) > + (name "emacs-org-texlive-collection") > + (source #f) > + (build-system trivial-build-system) > + (arguments (list #:builder #~(mkdir #$output))) > + (native-inputs '()) > + (inputs '()) > + (propagated-inputs > + (list texlive-amsmath > + texlive-capt-of > + texlive-graphics ;for graphicx, rotating > + texlive-hyperref > + texlive-titling > + texlive-tools ;for longtable > + texlive-ulem > + texlive-wrapfig > + texlive-scheme-small)) ;for amsfonts, fontspec, > inputenc, etc. Nitpick: these comments are not aligned. As a personal thing, I also suggest using a space between ; and for, but I see both styles used in Guix. > + (synopsis "Basic TexLive packages for Org-mode LaTeX export") > + (description "This meta-package propagates the TexLive packages > minimally > +required by the Org-mode produced LaTeX output."))) > + > (define-public emacs-org-contacts > ;; XXX: Upstream does not tag version bumps. Commit below matches > latest > ;; version bump. > > base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 Cheers
Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: [...] >> +(define-public emacs-org-texlive-collection >> + (package >> + (inherit emacs-org) >> + (name "emacs-org-texlive-collection") >> + (source #f) >> + (build-system trivial-build-system) >> + (arguments (list #:builder #~(mkdir #$output))) >> + (native-inputs '()) >> + (inputs '()) >> + (propagated-inputs >> + (list texlive-amsmath >> + texlive-capt-of >> + texlive-graphics ;for graphicx, rotating >> + texlive-hyperref >> + texlive-titling >> + texlive-tools ;for longtable >> + texlive-ulem >> + texlive-wrapfig >> + texlive-scheme-small)) ;for amsfonts, fontspec, >> inputenc, etc. > Nitpick: these comments are not aligned. This is actually how Emacs aligns them automatically, which I tend to stick to to avoid noise in diffs. > As a personal thing, I also suggest using a space between ; and for, > but I see both styles used in Guix. A space following ';' for inline comments is actually what seems to be our adopted convention (see "Riastradh's Lisp Style Rules", https://mumble.net/~campbell/scheme/style.txt referenced from (info '(guix) Formatting Code')). I must have dreamt Ludo suggestion to drop the space at some point in the distant past. I'll try to go back to '; comment' in my code, I guess! -- Thanks, Maxim
Hi again, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: [...] > Nitpick: these comments are not aligned. > As a personal thing, I also suggest using a space between ; and for, > but I see both styles used in Guix. Actually, re-reading our referenced style [0], it opines for no spaces between ';' and the comment, at least it says it's acceptable and uses that in its example: The only comments in which omission of a space between the semicolon and the text is acceptable are margin comments. Examples: ;;;; Frob Grovel ;;; This section of code has some important implications: ;;; 1. Foo. ;;; 2. Bar. ;;; 3. Baz. (define (fnord zarquon) ;; If zob, then veeblefitz. (quux zot mumble ;Zibblefrotz. frotz)) Phew. I can continue writing my inline comments the way I got accustomed to :-). [0] https://mumble.net/~campbell/scheme/style.txt
Am Freitag, dem 13.09.2024 um 23:16 +0900 schrieb Maxim Cournoyer: > Hi Liliana, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > [...] > > > > +(define-public emacs-org-texlive-collection > > > + (package > > > + (inherit emacs-org) > > > + (name "emacs-org-texlive-collection") > > > + (source #f) > > > + (build-system trivial-build-system) > > > + (arguments (list #:builder #~(mkdir #$output))) > > > + (native-inputs '()) > > > + (inputs '()) > > > + (propagated-inputs > > > + (list texlive-amsmath > > > + texlive-capt-of > > > + texlive-graphics ;for graphicx, rotating > > > + texlive-hyperref > > > + texlive-titling > > > + texlive-tools ;for longtable > > > + texlive-ulem > > > + texlive-wrapfig > > > + texlive-scheme-small)) ;for amsfonts, fontspec, > > > inputenc, etc. > > Nitpick: these comments are not aligned. > > This is actually how Emacs aligns them automatically, which I tend to > stick to to avoid noise in diffs. You might want to press M-; on that last one – I don't think it's aligned as per Emacs. > > As a personal thing, I also suggest using a space between ; and > > for, but I see both styles used in Guix. > > A space following ';' for inline comments is actually what seems to > be our adopted convention (see "Riastradh's Lisp Style Rules", > https://mumble.net/~campbell/scheme/style.txt referenced from (info > '(guix) Formatting Code')). > > I must have dreamt Ludo suggestion to drop the space at some point in > the distant past. I'll try to go back to '; comment' in my code, I > guess! Oh, good to know! Cheers
Am Freitag, dem 13.09.2024 um 23:28 +0900 schrieb Maxim Cournoyer: > Hi again, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > [...] > > > Nitpick: these comments are not aligned. > > As a personal thing, I also suggest using a space between ; and > > for, but I see both styles used in Guix. > > Actually, re-reading our referenced style [0], it opines for no > spaces between ';' and the comment, at least it says it's acceptable > and uses that in its example: > > The only comments in which omission of a space between the > semicolon and the text is acceptable are margin comments. > […] Yeah, again, it's a personal thing, not at all binding ;)
Hello, Maxim Cournoyer <maxim.cournoyer@gmail.com> writes: > +(define-public emacs-org-texlive-collection > + (package > + (inherit emacs-org) I don't understand why this inherits from Emacs Org. You're basically creating a specific TeX Live collection here. This should probably go to "tex.scm". > + (name "emacs-org-texlive-collection") > + (source #f) > + (build-system trivial-build-system) > + (arguments (list #:builder #~(mkdir #$output))) > + (native-inputs '()) > + (inputs '()) > + (propagated-inputs > + (list texlive-amsmath > + texlive-capt-of > + texlive-graphics ;for graphicx, rotating > + texlive-hyperref > + texlive-titling > + texlive-tools ;for longtable > + texlive-ulem > + texlive-wrapfig > + texlive-scheme-small)) ;for amsfonts, fontspec, inputenc, etc. This is much larger than what Org expects. The scheme above provides XeTeX and Metapost, for example. I think it should be leaner if it propagated provided texlive-collection-latexrecommended and a few additional packages. Note that texlive-tools, texlive-graphics and texlive-amsmath are included already in texlive-scheme-small (and texlive-collection-latexrecommended for that matter). Out of my memories, I think it also needs texlive-soul. > + (synopsis "Basic TexLive packages for Org-mode LaTeX export") Nitpick: TeX Live. Org mode. > + (description "This meta-package propagates the TexLive packages minimally > +required by the Org-mode produced LaTeX output."))) Ditto. > + > (define-public emacs-org-contacts > ;; XXX: Upstream does not tag version bumps. Commit below matches latest > ;; version bump. > > base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 Regards,
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7368589d7b..de42d9ebd9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> -;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2017-2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz> @@ -17655,6 +17655,29 @@ (define-public emacs-org-contrib compatible with the Org stable version.") (license license:gpl3+))) +(define-public emacs-org-texlive-collection + (package + (inherit emacs-org) + (name "emacs-org-texlive-collection") + (source #f) + (build-system trivial-build-system) + (arguments (list #:builder #~(mkdir #$output))) + (native-inputs '()) + (inputs '()) + (propagated-inputs + (list texlive-amsmath + texlive-capt-of + texlive-graphics ;for graphicx, rotating + texlive-hyperref + texlive-titling + texlive-tools ;for longtable + texlive-ulem + texlive-wrapfig + texlive-scheme-small)) ;for amsfonts, fontspec, inputenc, etc. + (synopsis "Basic TexLive packages for Org-mode LaTeX export") + (description "This meta-package propagates the TexLive packages minimally +required by the Org-mode produced LaTeX output."))) + (define-public emacs-org-contacts ;; XXX: Upstream does not tag version bumps. Commit below matches latest ;; version bump.