From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Suhail Singh" Newsgroups: gmane.emacs.bugs Subject: bug#72945: [PATCH 2/2] ox-html: Add support for attr_html in fixed-width blocks Date: Sun, 01 Sep 2024 21:58:02 -0400 Message-ID: <87o7566clx.fsf@gmail.com> References: <87seui27tf.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2825"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 72945@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Sep 02 04:08:14 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1skwUI-0000aN-8p for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 02 Sep 2024 04:08:14 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1skwU7-00081k-SS; Sun, 01 Sep 2024 22:08:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1skwU6-00081M-Db for bug-gnu-emacs@gnu.org; Sun, 01 Sep 2024 22:08:02 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1skwU6-00063E-3v for bug-gnu-emacs@gnu.org; Sun, 01 Sep 2024 22:08:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=3vU4UXd5nGZsJOkc6g7B0j7cH9MM8/PzEuzMqWmLsNY=; b=BMVNuqPOs6rXMftCkdB7OHELsdfo+9iuWIqscjKsyaI9HgSexOjnJFxlfCYc7E/xFM7l/PMTfx6Xtq4/WczAmk2z8liXM59qXr19d6AZnBz2XJAQVR64t4//p/wvzH857tNi05waPcMdMvBJh5NPN5MdCb3YzncktabJ0yOmvwv0g4w44u+VbNP0NJgQ1OI4qVnxBFQGZyqjkjJV+zpsygkwZOvvz+b48BWgpLpc1kn7YQ8p5MNK/KbVui5iL03efHPxWN/Zn0qbs5CSOSeTjcotxP8njd8evNApp8g0YCyjfvqLDz4EO7ZqnxYJwMUFD6NgqrudV7SUjLGerYGVdg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1skwV4-0004Ek-9X for bug-gnu-emacs@gnu.org; Sun, 01 Sep 2024 22:09:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 02 Sep 2024 02:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72945 X-GNU-PR-Package: emacs Original-Received: via spool by 72945-submit@debbugs.gnu.org id=B72945.172524291916222 (code B ref 72945); Mon, 02 Sep 2024 02:09:02 +0000 Original-Received: (at 72945) by debbugs.gnu.org; 2 Sep 2024 02:08:39 +0000 Original-Received: from localhost ([127.0.0.1]:41574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skwUh-0004DZ-5J for submit@debbugs.gnu.org; Sun, 01 Sep 2024 22:08:39 -0400 Original-Received: from mail-qv1-f65.google.com ([209.85.219.65]:42074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skwUf-0004D0-Nd for 72945@debbugs.gnu.org; Sun, 01 Sep 2024 22:08:38 -0400 Original-Received: by mail-qv1-f65.google.com with SMTP id 6a1803df08f44-6c35b72f943so8862626d6.0 for <72945@debbugs.gnu.org>; Sun, 01 Sep 2024 19:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725242791; x=1725847591; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3vU4UXd5nGZsJOkc6g7B0j7cH9MM8/PzEuzMqWmLsNY=; b=jOakYbk1NL8Sj+G1pP+cA/uqumtQWzfMQLeVxdRDccujDPNUw6fCzS6DZzQxYibboW LRQRMp5rNEu9lCDNsY5rFlCTF8zzdg2uxEktt1uSK0wtIu46oIABTCUBNd2FnvM6wYyq ZrzKnv7L3YskRTau78quQ7j5XSox0o7tsjofprXrRbImuI6uhyN+P0IVW+37DGdRdLQ3 9ReOKcn3YBCDDsN9QEOHETmBEzWtMOFGJUqecEUkxnml13HKulFEqLmx/aRN/iQn6LyJ 1otxuCfu/5xF3xqObcbWPsk7rpEZa19W28o8SZ+eNRroEgHG/u1K5/SAPczTbAtk8I8w NOXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725242791; x=1725847591; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3vU4UXd5nGZsJOkc6g7B0j7cH9MM8/PzEuzMqWmLsNY=; b=EdlmJjf/jOEflC4G06XN4LylcgqGJ3bs4m8Hwt6C4OuRbjg013W7cfiYBkt67VZ76U I/lYBlVr7jeQtleJUq/4SUuWXkvE2Wv00dhE9HEv2iHqTUusfM5OxtdPO7Jhcm0a1nlt jgRpzaYmU7sTkTnzC93mpKcMif/nKs9IQk5ZJACA4yNLcN4Q2w5GCcvndwvUBKzl8aDV U0ywXw5VEtjEJOWKMGmhQbNJbhuz1Zs1iLUTdnIgPmk+y6HG9OygZ29YlcO5I2F3ChbU Ex0Y74IcfnHkopB7MsOumVIwWpd8ljBYmsM8z0uqVzstLeUotPQ8C54L0cg1M7IUAnLh PvjA== X-Gm-Message-State: AOJu0Yy6ePTzAsMmREutzbG03OJMEapX+VIRwYe1IGcdGGZBoJSlSLx9 RD2dODSU76xdoZRfWZ+MqRlWn05bflzUuEp5gXigCUEMjOXL2ZWadbxv9N+2 X-Google-Smtp-Source: AGHT+IFfSFfCM05oLoftWDQW2mNuTW4t2V6vYh7B/dkNmtRJbiZwatt64z7Gzhh93KP0WHpc+bJ2Eg== X-Received: by 2002:a05:620a:1aaa:b0:79c:1178:dc9d with SMTP id af79cd13be357-7a812014bfemr1721305885a.24.1725242293425; Sun, 01 Sep 2024 18:58:13 -0700 (PDT) Original-Received: from gnus ([65.94.70.53]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a806c49cabsm376320985a.61.2024.09.01.18.58.12 for <72945@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Sep 2024 18:58:13 -0700 (PDT) In-Reply-To: <87seui27tf.fsf@gmail.com> (Suhail Singh's message of "Sun, 01 Sep 2024 20:55:08 -0400") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:291082 Archived-At: * lisp/ox-html.el (org-html-fixed-width): Handle attr_html in a manner similar to example blocks. TINYCHANGE --- lisp/ox-html.el | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 3e83f02e2..a85b1e6ac 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -2728,13 +2728,23 @@ (defun org-html-export-block ;;;; Fixed Width -(defun org-html-fixed-width (fixed-width _contents _info) +(defun org-html-fixed-width (fixed-width _contents info) "Transcode a FIXED-WIDTH element from Org to HTML. CONTENTS is nil. INFO is a plist holding contextual information." - (format "
\n%s
" - (org-html-do-format-code - (org-remove-indentation - (org-element-property :value fixed-width))))) + (let ((attributes (org-export-read-attribute :attr_html fixed-width))) + (if-let ((class-val (plist-get attributes :class))) + (setq attributes (plist-put attributes :class (concat "example " class-val))) + (setq attributes (plist-put attributes :class "example"))) + (format "\n%s" + (let* ((reference (org-html--reference fixed-width info)) + (a (org-html--make-attribute-string + (if (or (not reference) (plist-member attributes :id)) + attributes + (plist-put attributes :id reference))))) + (if (org-string-nw-p a) (concat " " a) "")) + (org-html-do-format-code + (org-remove-indentation + (org-element-property :value fixed-width)))))) ;;;; Footnote Reference -- 2.46.0