PATCH: include controlling language= in my previous patch

PATCH: include controlling language= in my previous patch

[Pedro Andres Aranda Gutierrez]

[-- Attachment #1.1: Type: text/plain, Size: 621 bytes --]

Hi,

I have a second version of my previous patch, inlcuing and extra variable
to control whether you want to include the language= or not. It is made in
a backwards-compatible way. Default is to include it and you have to

(setq org-latex-listings-src-omit-language t)

to omit language=

I guess this full patch would go (if accepted) in the next release...

Thx, /PA
-- 
Fragen sind nicht da um beantwortet zu werden,
Fragen sind da um gestellt zu werden
Georg Kreisler

Headaches with a Juju log:
unit-basic-16: 09:17:36 WARNING juju.worker.uniter.operation we should run
a leader-deposed hook here, but we can't yet

[-- Attachment #1.2: Type: text/html, Size: 977 bytes --]

[-- Attachment #2: org-nolabels-lang.diff --]
[-- Type: text/x-patch, Size: 1879 bytes --]

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 5b29a284c..a319fa830 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1021,6 +1021,16 @@ in this list - but it does not hurt if it is present."
 	   (symbol :tag "Major mode       ")
 	   (string :tag "Listings language"))))
 
+(defcustom org-latex-listings-src-omit-language nil
+  "Set this option to t to omit the
+\"language=\"
+in the parameters to \\begin{lstlisting} when exporting a src block"
+  :group 'org-export-latex
+  :version "30.0"
+  :package-version '(Org . "9.7")
+  :type 'boolean
+  )
+
 (defcustom org-latex-listings-options nil
   "Association list of options for the latex listings package.
 
@@ -3593,12 +3603,13 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((string= "multicolumn" float) '(("float" "*")))
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
-         `(("language" ,lst-lang))
-         (if label
-             `(("label" ,(org-latex--label src-block info)))
-           '(("label" " ")))
-         (if caption-str `(("caption" ,caption-str)) '(("caption" " ")))
-         `(("captionpos" ,(if caption-above-p "t" "b")))
+         (unless org-latex-listings-src-omit-language
+           `(("language" ,lst-lang)))
+         (when label                    ; label= w/o label makes little sense
+             `(("label" ,(org-latex--label src-block info))))
+         (when caption-str              ; caption= w/o caption makes little sense
+           `(("caption" ,caption-str))
+           `(("captionpos" ,(if caption-above-p "t" "b")))) ; as does captionpos w/o caption
          (cond ((assoc "numbers" lst-opt) nil)
                ((not num-start) '(("numbers" "none")))
                (t `(("firstnumber" ,(number-to-string (1+ num-start)))

Re: PATCH: include controlling language= in my previous patch

[Ihor Radchenko]

Note: This email thread is a followup for https://orgmode.org/list/CAO48Bk_6bqKgp1MgnZaARYku2+St6R1D4Bziq5NzMWNEWqfitw@mail.gmail.com

Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:

> I have a second version of my previous patch, inlcuing and extra variable
> to control whether you want to include the language= or not. It is made in
> a backwards-compatible way. Default is to include it and you have to
>
> (setq org-latex-listings-src-omit-language t)
>
> to omit language=

Makes sense from a first glance.

> +         (when label                    ; label= w/o label makes little sense
> +             `(("label" ,(org-latex--label src-block info))))
> +         (when caption-str              ; caption= w/o caption makes little sense
> +           `(("caption" ,caption-str))
> +           `(("captionpos" ,(if caption-above-p "t" "b")))) ; as does captionpos w/o caption

This is not true. We do need that empty caption/label.
See
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=eaaa5c2e4
and
https://orgmode.org/list/534BEAFB.4080607@gmx.de

Also, if you can, please create a proper patch instead of diff. See
https://orgmode.org/worg/org-contribute.html#first-patch

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: PATCH: include controlling language= in my previous patch

[Pedro Andres Aranda Gutierrez]

[-- Attachment #1.1: Type: text/plain, Size: 2982 bytes --]

Hi Ihor,

thanks for the patience. I have a comment on the message you refer to... If
comes from 2014.

So I have resorted to my fresh Emacs29, opened it with emacs -Q for a clean
environment.

With the MWE
```
#+CAPTION: caption of block 1
#+BEGIN_SRC asm
vmpovapd %%zmm0, %zmm1
#+END_SRC


#+LABEL: lst:second
#+BEGIN_SRC asm
vmpovapd %%zmm0, %zmm1
#+END_SRC

# Local Variables:
# org-latex-listings: 'listings
# End:
```
I get the following:
```
\begin{lstlisting}[language=asm,label= ,caption={caption of block
1},captionpos=b,numbers=none]
vmpovapd %%zmm0, %zmm1
\end{lstlisting}


\begin{lstlisting}[language=asm,label=lst:org2f3fc09,caption=
,captionpos=b,numbers=none]
vmpovapd %%zmm0, %zmm1
\end{lstlisting}

```

In my most humble opinion, I looks like the global \lstset{} isn't used and
that the caption/label is set locally. And this makes me believe that
label= or caption= are not very useful.

I have extended my research to a SRC block without language and that
results in a \begin{verbatim}--\end{verbatim}

I'm attaching the patch generated with git diff -p.
Mea culpa, I should have RTFM before sending anything :-)

Best, /PA


On Sun, 11 Dec 2022 at 11:05, Ihor Radchenko <yantar92@posteo.net> wrote:

> Note: This email thread is a followup for
> https://orgmode.org/list/CAO48Bk_6bqKgp1MgnZaARYku2+St6R1D4Bziq5NzMWNEWqfitw@mail.gmail.com
>
> Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:
>
> > I have a second version of my previous patch, inlcuing and extra variable
> > to control whether you want to include the language= or not. It is made
> in
> > a backwards-compatible way. Default is to include it and you have to
> >
> > (setq org-latex-listings-src-omit-language t)
> >
> > to omit language=
>
> Makes sense from a first glance.
>
> > +         (when label                    ; label= w/o label makes little
> sense
> > +             `(("label" ,(org-latex--label src-block info))))
> > +         (when caption-str              ; caption= w/o caption makes
> little sense
> > +           `(("caption" ,caption-str))
> > +           `(("captionpos" ,(if caption-above-p "t" "b")))) ; as does
> captionpos w/o caption
>
> This is not true. We do need that empty caption/label.
> See
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=eaaa5c2e4
> and
> https://orgmode.org/list/534BEAFB.4080607@gmx.de
>
> Also, if you can, please create a proper patch instead of diff. See
> https://orgmode.org/worg/org-contribute.html#first-patch
>
> --
> Ihor Radchenko // yantar92,
> Org mode contributor,
> Learn more about Org mode at <https://orgmode.org/>.
> Support Org development at <https://liberapay.com/org-mode>,
> or support my work at <https://liberapay.com/yantar92>
>


-- 
Fragen sind nicht da um beantwortet zu werden,
Fragen sind da um gestellt zu werden
Georg Kreisler

Headaches with a Juju log:
unit-basic-16: 09:17:36 WARNING juju.worker.uniter.operation we should run
a leader-deposed hook here, but we can't yet

[-- Attachment #1.2: Type: text/html, Size: 5163 bytes --]

[-- Attachment #2: org-nolabels-lang.diff --]
[-- Type: text/x-patch, Size: 1879 bytes --]

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 5b29a284c..a319fa830 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1021,6 +1021,16 @@ in this list - but it does not hurt if it is present."
 	   (symbol :tag "Major mode       ")
 	   (string :tag "Listings language"))))
 
+(defcustom org-latex-listings-src-omit-language nil
+  "Set this option to t to omit the
+\"language=\"
+in the parameters to \\begin{lstlisting} when exporting a src block"
+  :group 'org-export-latex
+  :version "30.0"
+  :package-version '(Org . "9.7")
+  :type 'boolean
+  )
+
 (defcustom org-latex-listings-options nil
   "Association list of options for the latex listings package.
 
@@ -3593,12 +3603,13 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((string= "multicolumn" float) '(("float" "*")))
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
-         `(("language" ,lst-lang))
-         (if label
-             `(("label" ,(org-latex--label src-block info)))
-           '(("label" " ")))
-         (if caption-str `(("caption" ,caption-str)) '(("caption" " ")))
-         `(("captionpos" ,(if caption-above-p "t" "b")))
+         (unless org-latex-listings-src-omit-language
+           `(("language" ,lst-lang)))
+         (when label                    ; label= w/o label makes little sense
+             `(("label" ,(org-latex--label src-block info))))
+         (when caption-str              ; caption= w/o caption makes little sense
+           `(("caption" ,caption-str))
+           `(("captionpos" ,(if caption-above-p "t" "b")))) ; as does captionpos w/o caption
          (cond ((assoc "numbers" lst-opt) nil)
                ((not num-start) '(("numbers" "none")))
                (t `(("firstnumber" ,(number-to-string (1+ num-start)))

Re: PATCH: include controlling language= in my previous patch

[Ihor Radchenko]

Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:

> thanks for the patience. I have a comment on the message you refer to... If
> comes from 2014.
>
> So I have resorted to my fresh Emacs29, opened it with emacs -Q for a clean
> environment.
> ...
> In my most humble opinion, I looks like the global \lstset{} isn't used and
> that the caption/label is set locally. And this makes me believe that
> label= or caption= are not very useful.

I guess it is after https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=6ef33b6dd

If the cited issue is no longer need to be accounted for, your version
should be fine.

> I'm attaching the patch generated with git diff -p.
> Mea culpa, I should have RTFM before sending anything :-)

For the final version of the patch, you may better follow
https://orgmode.org/worg/org-contribute.html#orgbc683f3 to create a
.patch file. The .patch file will include your authorship. Do not forget
the changelog entry.

> +(defcustom org-latex-listings-src-omit-language nil
> +  "Set this option to t to omit the
> +\"language=\"
> +in the parameters to \\begin{lstlisting} when exporting a src block"
> +  :group 'org-export-latex
> +  :version "30.0"
> +  :package-version '(Org . "9.7")
> +  :type 'boolean
> +  )

Please do not leave handing ")" on separate lines. It is against common
Elisp style conventions. See D.1 Emacs Lisp Coding Conventions section
of Elisp manual:

   • Don’t make a habit of putting close-parentheses on lines by
     themselves; Lisp programmers find this disconcerting.

> +         (when label                    ; label= w/o label makes little sense
> +             `(("label" ,(org-latex--label src-block info))))
> +         (when caption-str              ; caption= w/o caption makes little sense
> +           `(("caption" ,caption-str))
> +           `(("captionpos" ,(if caption-above-p "t" "b")))) ; as does captionpos w/o caption

These comments are not really needed. Actually, it is that `if' that
deserved explanation. Not putting empty caption/label is intuitive.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: PATCH: include controlling language= in my previous patch

[Pedro Andres Aranda Gutierrez]

[-- Attachment #1.1: Type: text/plain, Size: 3041 bytes --]

Hi,

I've (finally) followed the procedure and broken up the patch in two. One
for the labels= ,caption=  and one for the language= control.

FYI, I have already cleared the FSF paperwork for an emacs patch.

Best, /PA

On Mon, 12 Dec 2022 at 11:11, Ihor Radchenko <yantar92@posteo.net> wrote:

> Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:
>
> > thanks for the patience. I have a comment on the message you refer to...
> If
> > comes from 2014.
> >
> > So I have resorted to my fresh Emacs29, opened it with emacs -Q for a
> clean
> > environment.
> > ...
> > In my most humble opinion, I looks like the global \lstset{} isn't used
> and
> > that the caption/label is set locally. And this makes me believe that
> > label= or caption= are not very useful.
>
> I guess it is after
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=6ef33b6dd
>
> If the cited issue is no longer need to be accounted for, your version
> should be fine.
>
> > I'm attaching the patch generated with git diff -p.
> > Mea culpa, I should have RTFM before sending anything :-)
>
> For the final version of the patch, you may better follow
> https://orgmode.org/worg/org-contribute.html#orgbc683f3 to create a
> .patch file. The .patch file will include your authorship. Do not forget
> the changelog entry.
>
> > +(defcustom org-latex-listings-src-omit-language nil
> > +  "Set this option to t to omit the
> > +\"language=\"
> > +in the parameters to \\begin{lstlisting} when exporting a src block"
> > +  :group 'org-export-latex
> > +  :version "30.0"
> > +  :package-version '(Org . "9.7")
> > +  :type 'boolean
> > +  )
>
> Please do not leave handing ")" on separate lines. It is against common
> Elisp style conventions. See D.1 Emacs Lisp Coding Conventions section
> of Elisp manual:
>
>    • Don’t make a habit of putting close-parentheses on lines by
>      themselves; Lisp programmers find this disconcerting.
>
> > +         (when label                    ; label= w/o label makes little
> sense
> > +             `(("label" ,(org-latex--label src-block info))))
> > +         (when caption-str              ; caption= w/o caption makes
> little sense
> > +           `(("caption" ,caption-str))
> > +           `(("captionpos" ,(if caption-above-p "t" "b")))) ; as does
> captionpos w/o caption
>
> These comments are not really needed. Actually, it is that `if' that
> deserved explanation. Not putting empty caption/label is intuitive.
>
> --
> Ihor Radchenko // yantar92,
> Org mode contributor,
> Learn more about Org mode at <https://orgmode.org/>.
> Support Org development at <https://liberapay.com/org-mode>,
> or support my work at <https://liberapay.com/yantar92>
>


-- 
Fragen sind nicht da um beantwortet zu werden,
Fragen sind da um gestellt zu werden
Georg Kreisler

Headaches with a Juju log:
unit-basic-16: 09:17:36 WARNING juju.worker.uniter.operation we should run
a leader-deposed hook here, but we can't yet

[-- Attachment #1.2: Type: text/html, Size: 4464 bytes --]

[-- Attachment #2: 0002-Allow-to-suppress-language-in-SRC-blocks.patch --]
[-- Type: text/x-patch, Size: 1536 bytes --]

From 3a4705f454ed5f692ce9d04f81d3ae9bc2efad56 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Mon, 12 Dec 2022 13:51:49 +0100
Subject: [PATCH 2/2] Allow to suppress language= in SRC blocks

---
 lisp/ox-latex.el | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index f03903605..924afb399 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1021,6 +1021,15 @@ in this list - but it does not hurt if it is present."
 	   (symbol :tag "Major mode       ")
 	   (string :tag "Listings language"))))
 
+(defcustom org-latex-listings-src-omit-language nil
+  "Set this option to t to omit the
+\"language=\"
+in the parameters to \\begin{lstlisting} when exporting a src block"
+  :group 'org-export-latex
+  :version "30.0"
+  :package-version '(Org . "9.7")
+  :type 'boolean)
+
 (defcustom org-latex-listings-options nil
   "Association list of options for the latex listings package.
 
@@ -3593,7 +3602,8 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((string= "multicolumn" float) '(("float" "*")))
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
-         `(("language" ,lst-lang))
+         (unless org-latex-listings-src-omit-language
+           `(("language" ,lst-lang)))
          (when label
              `(("label" ,(org-latex--label src-block info))))
          (when caption-str
-- 
2.25.1


[-- Attachment #3: 0001-Don-t-emit-empty-labels-and-captions-in-SRC-blocks.patch --]
[-- Type: text/x-patch, Size: 1482 bytes --]

From 3bc08d0ccabb2d3f4a0ea09bec5bc6a896c351ac Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Mon, 12 Dec 2022 13:49:35 +0100
Subject: [PATCH 1/2] Don't emit empty labels and captions in SRC blocks

---
 lisp/ox-latex.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index a2d60d5db..f03903605 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -3594,11 +3594,14 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
          `(("language" ,lst-lang))
-         (if label
-             `(("label" ,(org-latex--label src-block info)))
-           '(("label" " ")))
-         (if caption-str `(("caption" ,caption-str)) '(("caption" " ")))
-         `(("captionpos" ,(if caption-above-p "t" "b")))
+         (when label
+             `(("label" ,(org-latex--label src-block info))))
+         (when caption-str
+           `(("caption" ,caption-str)))
+         (when caption-str
+           ;; caption-above-p means captionpos is t(op)
+           ;; else b(ottom)
+           `(("captionpos" ,(if caption-above-p "t" "b"))))
          (cond ((assoc "numbers" lst-opt) nil)
                ((not num-start) '(("numbers" "none")))
                (t `(("firstnumber" ,(number-to-string (1+ num-start)))
-- 
2.25.1

Re: PATCH: include controlling language= in my previous patch

[Ihor Radchenko]

Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:

> I've (finally) followed the procedure and broken up the patch in two. One
> for the labels= ,caption=  and one for the language= control.

Thanks!
You also need to provide etc/ORG-NEWS entry since we are adding a new
feature here.

> FYI, I have already cleared the FSF paperwork for an emacs patch.

Bastien, could you kindly confirm?

> Subject: [PATCH 2/2] Allow to suppress language= in SRC blocks

Please also provide changelog entries. See
https://orgmode.org/worg/org-contribute.html#commit-messages

> +(defcustom org-latex-listings-src-omit-language nil
> +  "Set this option to t to omit the
> +\"language=\"
> +in the parameters to \\begin{lstlisting} when exporting a src block"

Please describe in the docstring when this kind of setting is needed.

> +  :group 'org-export-latex
> +  :version "30.0"

:version is not necessary. See 15.1 Common Item Keywords section of
Elisp manual:

    ‘:version VERSION’
         This keyword specifies that the item was first introduced in Emacs
         version VERSION, or that its default value was changed in that
         version.  The value VERSION must be a string.
    
    ‘:package-version '(PACKAGE . VERSION)’
         This keyword specifies that the item was first introduced in
         PACKAGE version VERSION, or that its meaning or default value was
         changed in that version.  This keyword takes priority over
                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
         ‘:version’.
         ^^^^^^^^^^^

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: PATCH: include controlling language= in my previous patch

[Pedro Andres Aranda Gutierrez]

[-- Attachment #1.1: Type: text/plain, Size: 2364 bytes --]

Hi,

thanks for the patience. I hope to have implemented all suggestions by now.

BR,/PA

On Tue, 13 Dec 2022 at 10:24, Ihor Radchenko <yantar92@posteo.net> wrote:

> Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:
>
> > I've (finally) followed the procedure and broken up the patch in two. One
> > for the labels= ,caption=  and one for the language= control.
>
> Thanks!
> You also need to provide etc/ORG-NEWS entry since we are adding a new
> feature here.
>
> > FYI, I have already cleared the FSF paperwork for an emacs patch.
>
> Bastien, could you kindly confirm?
>
> > Subject: [PATCH 2/2] Allow to suppress language= in SRC blocks
>
> Please also provide changelog entries. See
> https://orgmode.org/worg/org-contribute.html#commit-messages
>
> > +(defcustom org-latex-listings-src-omit-language nil
> > +  "Set this option to t to omit the
> > +\"language=\"
> > +in the parameters to \\begin{lstlisting} when exporting a src block"
>
> Please describe in the docstring when this kind of setting is needed.
>
> > +  :group 'org-export-latex
> > +  :version "30.0"
>
> :version is not necessary. See 15.1 Common Item Keywords section of
> Elisp manual:
>
>     ‘:version VERSION’
>          This keyword specifies that the item was first introduced in Emacs
>          version VERSION, or that its default value was changed in that
>          version.  The value VERSION must be a string.
>
>     ‘:package-version '(PACKAGE . VERSION)’
>          This keyword specifies that the item was first introduced in
>          PACKAGE version VERSION, or that its meaning or default value was
>          changed in that version.  This keyword takes priority over
>                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>          ‘:version’.
>          ^^^^^^^^^^^
>
> --
> Ihor Radchenko // yantar92,
> Org mode contributor,
> Learn more about Org mode at <https://orgmode.org/>.
> Support Org development at <https://liberapay.com/org-mode>,
> or support my work at <https://liberapay.com/yantar92>
>


-- 
Fragen sind nicht da um beantwortet zu werden,
Fragen sind da um gestellt zu werden
Georg Kreisler

Headaches with a Juju log:
unit-basic-16: 09:17:36 WARNING juju.worker.uniter.operation we should run
a leader-deposed hook here, but we can't yet

[-- Attachment #1.2: Type: text/html, Size: 3538 bytes --]

[-- Attachment #2: 0001-Don-t-emit-empty-labels-and-captions-in-SRC-blocks.patch --]
[-- Type: text/x-patch, Size: 1482 bytes --]

From 3bc08d0ccabb2d3f4a0ea09bec5bc6a896c351ac Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Mon, 12 Dec 2022 13:49:35 +0100
Subject: [PATCH 1/4] Don't emit empty labels and captions in SRC blocks

---
 lisp/ox-latex.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index a2d60d5db..f03903605 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -3594,11 +3594,14 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
          `(("language" ,lst-lang))
-         (if label
-             `(("label" ,(org-latex--label src-block info)))
-           '(("label" " ")))
-         (if caption-str `(("caption" ,caption-str)) '(("caption" " ")))
-         `(("captionpos" ,(if caption-above-p "t" "b")))
+         (when label
+             `(("label" ,(org-latex--label src-block info))))
+         (when caption-str
+           `(("caption" ,caption-str)))
+         (when caption-str
+           ;; caption-above-p means captionpos is t(op)
+           ;; else b(ottom)
+           `(("captionpos" ,(if caption-above-p "t" "b"))))
          (cond ((assoc "numbers" lst-opt) nil)
                ((not num-start) '(("numbers" "none")))
                (t `(("firstnumber" ,(number-to-string (1+ num-start)))
-- 
2.25.1


[-- Attachment #3: 0004-Add-entries-to-ORG-NEWS-for-changes-and-org-latex-li.patch --]
[-- Type: text/x-patch, Size: 2065 bytes --]

From 33d2ca63e749da8f1faacb66ece636df66464416 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Tue, 13 Dec 2022 12:07:09 +0100
Subject: [PATCH 4/4] Add entries to ORG-NEWS for changes and
 org-latex-listings-src-omit-language

---
 etc/ORG-NEWS | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 5d5e726e0..7fa9122ee 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -432,6 +432,20 @@ following properties: ~:hook~, ~:prepare-finalize~,
 ~:before-finalize~, ~:after-finalize~.  These nullary functions run
 prior to their global counterparts for the selected template.
 
+
+*** New =org-latex-listings-src-omit-language= variable for LaTeX export
+
+The =org-latex-listings-src-omit-language= customization variable
+allows you to omit the =language= parameter in the exported
+=lstlisting= environment. This is necessary when the =listings= backend
+forwards the actual listing generation to another package like
+=fancyvrb= using the following setup in the document header:
+#+BEGIN_example
+#+LATEX_HEADER: \\RequirePackage{fancyvrb}
+#+LATEX_HEADER: \\DefineVerbatimEnvironment{verbatim}{Verbatim}{...whatever...}
+#+LATEX_HEADER: \\DefineVerbatimEnvironment{lstlisting}{Verbatim}{...whatever...}
+#+END_example
+
 ** New options
 *** A new option for custom setting ~org-refile-use-outline-path~ to show document title in refile targets
 
@@ -747,6 +761,18 @@ following snippet to allow multiple different ID formats in Org files.
         org-attach-id-uuid-folder-format
         org-attach-id-ts-folder-format))
 #+end_src
+*** The LaTeX export backend only emits =label= and =caption= when they are not empty
+
+When exporting a SRC block and using the listings backend , =label==
+and =caption== parameters for the =lstlisting= environment will be
+only generated when they are not empty. Things like
+
+#+BEGIN_src latex
+\begin{lstlisting}[label= ,caption= ,captionpos=b]
+\end{lstlisting}
+#+END_src
+
+will no more appear.
 
 * Version 9.5
 
-- 
2.25.1


[-- Attachment #4: 0002-Allow-to-suppress-language-in-SRC-blocks.patch --]
[-- Type: text/x-patch, Size: 1536 bytes --]

From 3a4705f454ed5f692ce9d04f81d3ae9bc2efad56 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Mon, 12 Dec 2022 13:51:49 +0100
Subject: [PATCH 2/4] Allow to suppress language= in SRC blocks

---
 lisp/ox-latex.el | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index f03903605..924afb399 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1021,6 +1021,15 @@ in this list - but it does not hurt if it is present."
 	   (symbol :tag "Major mode       ")
 	   (string :tag "Listings language"))))
 
+(defcustom org-latex-listings-src-omit-language nil
+  "Set this option to t to omit the
+\"language=\"
+in the parameters to \\begin{lstlisting} when exporting a src block"
+  :group 'org-export-latex
+  :version "30.0"
+  :package-version '(Org . "9.7")
+  :type 'boolean)
+
 (defcustom org-latex-listings-options nil
   "Association list of options for the latex listings package.
 
@@ -3593,7 +3602,8 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((string= "multicolumn" float) '(("float" "*")))
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
-         `(("language" ,lst-lang))
+         (unless org-latex-listings-src-omit-language
+           `(("language" ,lst-lang)))
          (when label
              `(("label" ,(org-latex--label src-block info))))
          (when caption-str
-- 
2.25.1


[-- Attachment #5: 0003-Refine-DOCSTRING-for-org-latex-listings-src-omit-lan.patch --]
[-- Type: text/x-patch, Size: 1313 bytes --]

From 57eef55b0e903f880a1693d51b1e123220cfce78 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Tue, 13 Dec 2022 12:06:26 +0100
Subject: [PATCH 3/4] Refine DOCSTRING for org-latex-listings-src-omit-language

---
 lisp/ox-latex.el | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 924afb399..f18c2a068 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1024,9 +1024,18 @@ in this list - but it does not hurt if it is present."
 (defcustom org-latex-listings-src-omit-language nil
   "Set this option to t to omit the
 \"language=\"
-in the parameters to \\begin{lstlisting} when exporting a src block"
+in the parameters to \\begin{lstlisting} when exporting a src block.
+
+This is necessary, for example, when the `fancyvrb' package is used
+instead of `listings' by including the following in the doc header:
+
+#+LATEX_HEADER: \\RequirePackage{fancyvrb}
+#+LATEX_HEADER: \\DefineVerbatimEnvironment{verbatim}{Verbatim}{...}
+#+LATEX_HEADER: \\DefineVerbatimEnvironment{lstlisting}{Verbatim}{...}
+
+{...} is whatever default parameters you need to pass to either environment.
+"
   :group 'org-export-latex
-  :version "30.0"
   :package-version '(Org . "9.7")
   :type 'boolean)
 
-- 
2.25.1

Re: PATCH: include controlling language= in my previous patch

[Ihor Radchenko]

Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:

> thanks for the patience. I hope to have implemented all suggestions by now.

No. You missed several.

1. :version is not necessary. See 15.1 Common Item Keywords section of
Elisp manual:

2. Please also provide changelog entries. See
https://orgmode.org/worg/org-contribute.html#commit-messages

More comments below.
 
> +*** New =org-latex-listings-src-omit-language= variable for LaTeX export
> +
> +The =org-latex-listings-src-omit-language= customization variable
> +allows you to omit the =language= parameter in the exported
> +=lstlisting= environment. This is necessary when the =listings= backend
> +forwards the actual listing generation to another package like
> +=fancyvrb= using the following setup in the document header:

Please use ~code~ for Elisp symbols and double space between sentences.
You may refer to etc/Documentation_Standards.org file for details.

> +#+BEGIN_example
> +#+LATEX_HEADER: \\RequirePackage{fancyvrb}
> +#+LATEX_HEADER: \\DefineVerbatimEnvironment{verbatim}{Verbatim}{...whatever...}
> +#+LATEX_HEADER: \\DefineVerbatimEnvironment{lstlisting}{Verbatim}{...whatever...}
> +#+END_example

Please quote #+LATEX_HEADER in the example block with commas. (Org will
do it automatically for you if you edit the example block with C-c ')

> +*** The LaTeX export backend only emits =label= and =caption= when they are not empty
> +
> +When exporting a SRC block and using the listings backend , =label==
> +and =caption== parameters for the =lstlisting= environment will be
> +only generated when they are not empty. Things like
> +
> +#+BEGIN_src latex
> +\begin{lstlisting}[label= ,caption= ,captionpos=b]
> +\end{lstlisting}
> +#+END_src
> +
> +will no more appear.

This is probably not something people need to take note of. Not necessary.
  
> Subject: [PATCH 2/4] Allow to suppress language= in SRC blocks
> Subject: [PATCH 3/4] Refine DOCSTRING for org-latex-listings-src-omit-language

2nd and 3rd patches can be merged into one.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: PATCH: include controlling language= in my previous patch

[Pedro Andres Aranda Gutierrez]

[-- Attachment #1.1: Type: text/plain, Size: 2743 bytes --]

Next try... I'm learning a lot :-)

BR,/PA


On Tue, 13 Dec 2022 at 12:51, Ihor Radchenko <yantar92@posteo.net> wrote:

> Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:
>
> > thanks for the patience. I hope to have implemented all suggestions by
> now.
>
> No. You missed several.
>
> 1. :version is not necessary. See 15.1 Common Item Keywords section of
> Elisp manual:
>
> 2. Please also provide changelog entries. See
> https://orgmode.org/worg/org-contribute.html#commit-messages
>
> More comments below.
>
> > +*** New =org-latex-listings-src-omit-language= variable for LaTeX export
> > +
> > +The =org-latex-listings-src-omit-language= customization variable
> > +allows you to omit the =language= parameter in the exported
> > +=lstlisting= environment. This is necessary when the =listings= backend
> > +forwards the actual listing generation to another package like
> > +=fancyvrb= using the following setup in the document header:
>
> Please use ~code~ for Elisp symbols and double space between sentences.
> You may refer to etc/Documentation_Standards.org file for details.
>
> > +#+BEGIN_example
> > +#+LATEX_HEADER: \\RequirePackage{fancyvrb}
> > +#+LATEX_HEADER:
> \\DefineVerbatimEnvironment{verbatim}{Verbatim}{...whatever...}
> > +#+LATEX_HEADER:
> \\DefineVerbatimEnvironment{lstlisting}{Verbatim}{...whatever...}
> > +#+END_example
>
> Please quote #+LATEX_HEADER in the example block with commas. (Org will
> do it automatically for you if you edit the example block with C-c ')
>
> > +*** The LaTeX export backend only emits =label= and =caption= when they
> are not empty
> > +
> > +When exporting a SRC block and using the listings backend , =label==
> > +and =caption== parameters for the =lstlisting= environment will be
> > +only generated when they are not empty. Things like
> > +
> > +#+BEGIN_src latex
> > +\begin{lstlisting}[label= ,caption= ,captionpos=b]
> > +\end{lstlisting}
> > +#+END_src
> > +
> > +will no more appear.
>
> This is probably not something people need to take note of. Not necessary.
>
> > Subject: [PATCH 2/4] Allow to suppress language= in SRC blocks
> > Subject: [PATCH 3/4] Refine DOCSTRING for
> org-latex-listings-src-omit-language
>
> 2nd and 3rd patches can be merged into one.
>
> --
> Ihor Radchenko // yantar92,
> Org mode contributor,
> Learn more about Org mode at <https://orgmode.org/>.
> Support Org development at <https://liberapay.com/org-mode>,
> or support my work at <https://liberapay.com/yantar92>
>


-- 
Fragen sind nicht da um beantwortet zu werden,
Fragen sind da um gestellt zu werden
Georg Kreisler

Headaches with a Juju log:
unit-basic-16: 09:17:36 WARNING juju.worker.uniter.operation we should run
a leader-deposed hook here, but we can't yet

[-- Attachment #1.2: Type: text/html, Size: 3950 bytes --]

[-- Attachment #2: 0003-etc-ORG-NEWS-add-org-latex-listings-src-omit-languag.patch --]
[-- Type: text/x-patch, Size: 1752 bytes --]

From dabdc3026e32ec674e22698de6257d724f60c4af Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Wed, 14 Dec 2022 07:32:31 +0100
Subject: [PATCH 3/3] etc/ORG-NEWS: add org-latex-listings-src-omit-language

* etc/ORG-NEWS: Add information for `org-latex-listings-src-omit-language'
---
 etc/ORG-NEWS | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 5d5e726e0..bd78ed9a7 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -432,6 +432,21 @@ following properties: ~:hook~, ~:prepare-finalize~,
 ~:before-finalize~, ~:after-finalize~.  These nullary functions run
 prior to their global counterparts for the selected template.
 
+
+*** New =org-latex-listings-src-omit-language= variable for LaTeX export
+
+The ~org-latex-listings-src-omit-language~ customization variable
+allows you to omit the =language= parameter in the exported
+=lstlisting= environment. This is necessary when the =listings=
+backend delegates listing generation to another package like
+=fancyvrb= using the following setup in the document header:
+
+#+BEGIN_src org
+,#+LATEX_HEADER: \RequirePackage{fancyvrb}
+,#+LATEX_HEADER: \DefineVerbatimEnvironment{verbatim}{Verbatim}{...whatever...}
+,#+LATEX_HEADER: \DefineVerbatimEnvironment{lstlisting}{Verbatim}{...whatever...}
+#+END_src
+
 ** New options
 *** A new option for custom setting ~org-refile-use-outline-path~ to show document title in refile targets
 
@@ -747,7 +762,6 @@ following snippet to allow multiple different ID formats in Org files.
         org-attach-id-uuid-folder-format
         org-attach-id-ts-folder-format))
 #+end_src
-
 * Version 9.5
 
 ** Important announcements and breaking changes
-- 
2.25.1


[-- Attachment #3: 0001-lisp-ox-latex.el-don-t-emit-empyt-label-caption.patch --]
[-- Type: text/x-patch, Size: 1633 bytes --]

From 2038bddb662f393d99ceb88c9bf9d2a6898919dc Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Wed, 14 Dec 2022 07:12:55 +0100
Subject: [PATCH 1/3] lisp/ox-latex.el: don't emit empyt label=, caption=

* lisp/ox-latex.el: (org-latex-src-block--listings):
  Don't emit label= if label is empty.
  DOn't emit caption= or captionpos= is caption is empty.
---
 lisp/ox-latex.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index a2d60d5db..f03903605 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -3594,11 +3594,14 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
          `(("language" ,lst-lang))
-         (if label
-             `(("label" ,(org-latex--label src-block info)))
-           '(("label" " ")))
-         (if caption-str `(("caption" ,caption-str)) '(("caption" " ")))
-         `(("captionpos" ,(if caption-above-p "t" "b")))
+         (when label
+             `(("label" ,(org-latex--label src-block info))))
+         (when caption-str
+           `(("caption" ,caption-str)))
+         (when caption-str
+           ;; caption-above-p means captionpos is t(op)
+           ;; else b(ottom)
+           `(("captionpos" ,(if caption-above-p "t" "b"))))
          (cond ((assoc "numbers" lst-opt) nil)
                ((not num-start) '(("numbers" "none")))
                (t `(("firstnumber" ,(number-to-string (1+ num-start)))
-- 
2.25.1


[-- Attachment #4: 0002-lisp-ox-latex.el-Add-org-latex-listings-src-omit-lan.patch --]
[-- Type: text/x-patch, Size: 2146 bytes --]

From af8a3032884e536aa4a398d3c248cb76b689b977 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Wed, 14 Dec 2022 07:22:23 +0100
Subject: [PATCH 2/3] lisp/ox-latex.el: Add
 org-latex-listings-src-omit-language

* lisp/ox-latex.el: Add org-latex-listings-src-omit-language variable
to control whether language= should be included in the parameters
of the lstlisting environmet generated by a SRC block.
---
 lisp/ox-latex.el | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index f03903605..f18c2a068 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1021,6 +1021,24 @@ in this list - but it does not hurt if it is present."
 	   (symbol :tag "Major mode       ")
 	   (string :tag "Listings language"))))
 
+(defcustom org-latex-listings-src-omit-language nil
+  "Set this option to t to omit the
+\"language=\"
+in the parameters to \\begin{lstlisting} when exporting a src block.
+
+This is necessary, for example, when the `fancyvrb' package is used
+instead of `listings' by including the following in the doc header:
+
+#+LATEX_HEADER: \\RequirePackage{fancyvrb}
+#+LATEX_HEADER: \\DefineVerbatimEnvironment{verbatim}{Verbatim}{...}
+#+LATEX_HEADER: \\DefineVerbatimEnvironment{lstlisting}{Verbatim}{...}
+
+{...} is whatever default parameters you need to pass to either environment.
+"
+  :group 'org-export-latex
+  :package-version '(Org . "9.7")
+  :type 'boolean)
+
 (defcustom org-latex-listings-options nil
   "Association list of options for the latex listings package.
 
@@ -3593,7 +3611,8 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
           ((string= "multicolumn" float) '(("float" "*")))
           ((and float (not (assoc "float" lst-opt)))
            `(("float" ,(plist-get info :latex-default-figure-position)))))
-         `(("language" ,lst-lang))
+         (unless org-latex-listings-src-omit-language
+           `(("language" ,lst-lang)))
          (when label
              `(("label" ,(org-latex--label src-block info))))
          (when caption-str
-- 
2.25.1

Re: PATCH: include controlling language= in my previous patch

[Ihor Radchenko]

Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:

> Next try... I'm learning a lot :-)

Then, next set of comments.

(Note that I can hand-fix the patches at this point for you. Let me know
if you want to keep going)

> From dabdc3026e32ec674e22698de6257d724f60c4af Mon Sep 17 00:00:00 2001
> From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
> Date: Wed, 14 Dec 2022 07:32:31 +0100
> Subject: [PATCH 3/3] etc/ORG-NEWS: add org-latex-listings-src-omit-language

                                    ^Add `...'

Also, it would make sense to merge this commit with the one introducing
the variable.  There is really not much reason to have two separate
commits here.

> * etc/ORG-NEWS: Add information for `org-latex-listings-src-omit-language'

Add "." at the end of the sentence ;)
Also, your Changelog entry does not include the parent heading.
I recommend following
https://orgmode.org/worg/org-contribute.html#org421ccec to produce
changelog automatically without much thinking.

> +*** New =org-latex-listings-src-omit-language= variable for LaTeX export

~org-latex...~

also, it is new _customization_, more precisely

> +The ~org-latex-listings-src-omit-language~ customization variable
> +allows you to omit the =language= parameter in the exported
> +=lstlisting= environment. This is necessary when the =listings=

By convention, we keep double space "  " between sentences.

> +backend delegates listing generation to another package like
> +=fancyvrb= using the following setup in the document header:
> +
> +#+BEGIN_src org
> +,#+LATEX_HEADER: \RequirePackage{fancyvrb}
> +,#+LATEX_HEADER: \DefineVerbatimEnvironment{verbatim}{Verbatim}{...whatever...}
> +,#+LATEX_HEADER: \DefineVerbatimEnvironment{lstlisting}{Verbatim}{...whatever...}
> +#+END_src

Is there any kind of blog/article demonstrating the usefulness. Not
strictly necessary, but may be helpful for others.

> Subject: [PATCH 1/3] lisp/ox-latex.el: don't emit empyt label=, caption=

_D_on't; empyt -> empty

> * lisp/ox-latex.el: (org-latex-src-block--listings):
>   Don't emit label= if label is empty.
>   DOn't emit caption= or captionpos= is caption is empty.

* lisp/ox-latex.el: (org-latex-src-block--listings): ->
* lisp/ox-latex.el (org-latex-src-block--listings):

DOn't -> Don't
is -> if

> Subject: [PATCH 2/3] lisp/ox-latex.el: Add
>  org-latex-listings-src-omit-language

`org-latex-listings-src-omit-language'

> * lisp/ox-latex.el: Add org-latex-listings-src-omit-language variable

`org-latex-listings-src-omit-language'

> +(defcustom org-latex-listings-src-omit-language nil
> +  "Set this option to t to omit the
> +\"language=\"
> +in the parameters to \\begin{lstlisting} when exporting a src block.

By convention, the first line of the docstring should be no wider than
67 chars and briefly describe the purpose of the variable. See
D.6 Tips for Documentation Strings section of Elisp manual:

   • The first line of the documentation string should consist of one or
     two complete sentences that stand on their own as a summary.  ‘M-x
     apropos’ displays just the first line, and if that line’s contents
     don’t stand on their own, the result looks bad.  In particular,
     start the first line with a capital letter and end it with a
     period.

     For a function, the first line should briefly answer the question,
     “What does this function do?” For a variable, the first line should
     briefly answer the question, “What does this value mean?”

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: PATCH: include controlling language= in my previous patch

[Bastien Guerry]

Sorry for the delay.

Ihor Radchenko <yantar92@posteo.net> writes:

>> FYI, I have already cleared the FSF paperwork for an emacs patch.
>
> Bastien, could you kindly confirm?

Yes, I do confirm Pedro's FSF paperwork is in order.

Thanks!

-- 
 Bastien

Re: PATCH: include controlling language= in my previous patch

[Ihor Radchenko]

Ihor Radchenko <yantar92@posteo.net> writes:

> Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:
>
>> Next try... I'm learning a lot :-)
>
> Then, next set of comments.

As discussed privately, I have addressed the comments myself.
Now applied onto main.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=0c467b6b8
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=322b2fd22
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=a58ab9039

You are also now listed as an Org contributor.
https://git.sr.ht/~bzg/worg/commit/37b511a9

Thanks for your contribution!

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>