From: Pedro Andres Aranda Gutierrez <paaguti@gmail.com>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: Org Mode List <emacs-orgmode@gnu.org>
Subject: Re: PATCH: include controlling language= in my previous patch
Date: Sun, 11 Dec 2022 12:23:28 +0100 [thread overview]
Message-ID: <CAO48Bk9+48_AX4WBWp5f9rJqbNRY09R_VvmqYtkEfnQPKub9Ag@mail.gmail.com> (raw)
In-Reply-To: <87cz8qdzmy.fsf@localhost>
[-- 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)))
next prev parent reply other threads:[~2022-12-11 11:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-11 8:06 PATCH: include controlling language= in my previous patch Pedro Andres Aranda Gutierrez
2022-12-11 10:05 ` Ihor Radchenko
2022-12-11 11:23 ` Pedro Andres Aranda Gutierrez [this message]
2022-12-12 10:11 ` Ihor Radchenko
2022-12-12 12:57 ` Pedro Andres Aranda Gutierrez
2022-12-13 9:24 ` Ihor Radchenko
2022-12-13 11:08 ` Pedro Andres Aranda Gutierrez
2022-12-13 11:51 ` Ihor Radchenko
2022-12-14 6:37 ` Pedro Andres Aranda Gutierrez
2022-12-14 9:29 ` Ihor Radchenko
2022-12-18 13:17 ` Ihor Radchenko
2022-12-18 9:31 ` Bastien Guerry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAO48Bk9+48_AX4WBWp5f9rJqbNRY09R_VvmqYtkEfnQPKub9Ag@mail.gmail.com \
--to=paaguti@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=yantar92@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).