From unknown Fri Aug 15 15:56:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61306: [PATCH 0/5] Modernize the html engine Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: skribilo-bugs@nongnu.org Resent-Date: Mon, 06 Feb 2023 00:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61306 X-GNU-PR-Package: skribilo X-GNU-PR-Keywords: patch To: 61306@debbugs.gnu.org Cc: Arun Isaac X-Debbugs-Original-To: skribilo-bugs@nongnu.org Received: via spool by submit@debbugs.gnu.org id=B.167564200626479 (code B ref -1); Mon, 06 Feb 2023 00:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Feb 2023 00:06:46 +0000 Received: from localhost ([127.0.0.1]:46734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp1y-0006t1-23 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:06:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:43092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp1w-0006st-H7 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:06:44 -0500 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 1pOp1t-0003yk-NY for skribilo-bugs@nongnu.org; Sun, 05 Feb 2023 19:06:44 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOp1r-0006A0-WF for skribilo-bugs@nongnu.org; Sun, 05 Feb 2023 19:06:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mz4KuntclaPTmyZaRRKvp97w3n+9Y/jnk614oKcbmZo=; b=E1t1GDaR1eDZMxMbfyVK6mDkL7 BEgj4FrS0x3OCCirzHrco5i+CVWggAKk8Rvq+rF3iDAtWMIlX64p4Kt61P4g7e6ACb6z0tBZsd/OK Pyou7mdsdtM/dCa2/+69TzpO+zNAzlSkHf3hDfm+zDIVa5eTczdSkEmIPYAEhEmELpLXbyv0MJXM5 BAYb1x9ZvISNe4EBEfimnfV/tS9T/Js182nCwOcKEVM+15/eey6eVMSUGZPpsOoEwGQ1Nbha1hxd5 Ru7Gh7jXIbE8d7OA1wWM4YXawM2UMnwuWpMwNE6zSIBwG6PwMPJT/fhosjq2Rdfzd5uP37HJ+jJml G24VMuWQ==; Received: from [192.168.2.1] (port=44684 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp1n-0004BE-1g; Mon, 06 Feb 2023 05:36:35 +0530 From: Arun Isaac Date: Mon, 6 Feb 2023 00:06:26 +0000 Message-Id: <20230206000626.31832-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=139.59.75.54; envelope-from=arunisaac@systemreboot.net; helo=mugam.systemreboot.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This patchset adds a bunch of modernization fixes to the html engine. Mainly: - It removes br tags from various places. There is no need for br tags. Presentation should be handled in CSS. br tags insert unneeded unremovable space. - Modernize code to use match and for-each. Arun Isaac (5): html: Do not add br tag after chapter. html: Do not add br tag after section. html: Do not add br tags before footnotes. html: Use match instead of car and cdr. html: Use for-each instead of explicit loop. src/guile/skribilo/engine/html.scm | 99 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 51 deletions(-) -- 2.38.1 From unknown Fri Aug 15 15:56:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61306: [PATCH 2/5] html: Do not add br tag after section. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: skribilo-bugs@nongnu.org Resent-Date: Mon, 06 Feb 2023 00:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61306 X-GNU-PR-Package: skribilo X-GNU-PR-Keywords: patch To: 61306@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 61306-submit@debbugs.gnu.org id=B61306.167564211326702 (code B ref 61306); Mon, 06 Feb 2023 00:09:02 +0000 Received: (at 61306) by debbugs.gnu.org; 6 Feb 2023 00:08:33 +0000 Received: from localhost ([127.0.0.1]:46744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3g-0006wb-SR for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:33 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:49054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3f-0006wN-Fw for 61306@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Cav7zjo3qT4s0Lxjukm7MILUHHnP0eCNoujaUpWZvnE=; b=HG3qEVBFoQZPbaCpT6V3hxPSmL sdecR2fCIB1pZ08UoKPI25KiKXNR+5EFyU85N3PxMpPnYy6aGhHp85GOKNuhvfLzPqScV6/FgCO5m 3O6KwZcx/bKLkYXY2/b0PTsYxqvD9nMp5BxHUcgXhmkILjWVogU1HFc3Vi8Vc584o7bUOciy4/biw Vbanz0m+g7i9SbVXp0J9UYTcowcC1Z4lxurEqEYo3wBnSn7aKe7rcSF0CeKZOO0P0V4TsGy99j9kV oVDu2Kf7yvVaqMNBlE+5IvyjBTnTtT8s7CujtevVuobtHZaLPRb/KnUuWidqUHVdy3HuOzFu6fvXa 5IT7dYig==; Received: from [192.168.2.1] (port=59434 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp3d-0004Bd-0q; Mon, 06 Feb 2023 05:38:29 +0530 From: Arun Isaac Date: Mon, 6 Feb 2023 00:08:16 +0000 Message-Id: <20230206000819.32172-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230206000819.32172-1-arunisaac@systemreboot.net> References: <20230206000819.32172-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * src/guile/skribilo/engine/html.scm (section): Do not br tag after. --- src/guile/skribilo/engine/html.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 08a8eca..2ab5117 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -1368,7 +1368,7 @@ (markup-writer 'section :options '(:title :html-title :number :toc :file :env) :before html-section-title - :after "
\n") + :after "\n") ;; on-file section writer (markup-writer 'section -- 2.38.1 From unknown Fri Aug 15 15:56:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61306: [PATCH 1/5] html: Do not add br tag after chapter. References: <20230206000626.31832-1-arunisaac@systemreboot.net> In-Reply-To: <20230206000626.31832-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: skribilo-bugs@nongnu.org Resent-Date: Mon, 06 Feb 2023 00:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61306 X-GNU-PR-Package: skribilo X-GNU-PR-Keywords: patch To: 61306@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 61306-submit@debbugs.gnu.org id=B61306.167564211326711 (code B ref 61306); Mon, 06 Feb 2023 00:09:02 +0000 Received: (at 61306) by debbugs.gnu.org; 6 Feb 2023 00:08:33 +0000 Received: from localhost ([127.0.0.1]:46746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3h-0006wd-5b for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:33 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:49040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3f-0006wL-3M for 61306@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gouficZZ0Ebc7UwRkD4YqWWlgyb1plZqUB6F9+UpQwM=; b=cbd/2nZ43JK9z0FwgRZFHN8PmW ghRZL/7bBboMRNGeKQoa3pJZa7voES6RMyLHKLZmpUcx+hpUBtcho+YCO+S4c4HsxgaNI90l0i58C LnGOtV3ogJmfOdt9DNoWwCzvmGilCvEZ2KH88UL0S1c8D3L5lARlPnjBKiP7oHnnYDj5W9MP/gsKW Novj68Er6DwWr6dOorAlxFlXFxA0D619N+ghpQRDqxeleCBcLnpzc4gKq5ZLV4B7nIzGkvrh+rNxF sovcb6Tbs7UT026pmit7iQgJjqsRhN60fyclKblBT1AO83nGim9hIgfCBftL3Q8NTWG/uNOSE8W/a Kk0tI19g==; Received: from [192.168.2.1] (port=59434 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp3b-0004Bd-2j; Mon, 06 Feb 2023 05:38:28 +0530 From: Arun Isaac Date: Mon, 6 Feb 2023 00:08:15 +0000 Message-Id: <20230206000819.32172-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * src/guile/skribilo/engine/html.scm (chapter): Do not br tag after. --- src/guile/skribilo/engine/html.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 51d8eec..08a8eca 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -2,7 +2,7 @@ ;;; ;;; Copyright 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2018, 2020 Ludovic Courtès ;;; Copyright 2003, 2004 Manuel Serrano -;;; Copyright 2022 Arun Isaac +;;; Copyright 2022, 2023 Arun Isaac ;;; ;;; ;;; This file is part of Skribilo. @@ -1308,8 +1308,7 @@ (output (html-container-number n e) e) (display " ") (output (markup-option n :title) e) - (display ""))) - :after "
") + (display "")))) ;; This writer is invoked only for chapters rendered inside separate files! (markup-writer 'chapter -- 2.38.1 From unknown Fri Aug 15 15:56:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61306: [PATCH 4/5] html: Use match instead of car and cdr. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: skribilo-bugs@nongnu.org Resent-Date: Mon, 06 Feb 2023 00:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61306 X-GNU-PR-Package: skribilo X-GNU-PR-Keywords: patch To: 61306@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 61306-submit@debbugs.gnu.org id=B61306.167564211626726 (code B ref 61306); Mon, 06 Feb 2023 00:09:03 +0000 Received: (at 61306) by debbugs.gnu.org; 6 Feb 2023 00:08:36 +0000 Received: from localhost ([127.0.0.1]:46750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3j-0006wz-IM for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:35 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:49058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3h-0006wj-Ts for 61306@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vNf7rCrUgfrIqZy8w9mUd1i6kamj01YuEVwMfpsdDw0=; b=dGOG5fKcSE1izNdxbcmLoRiN9V WiBa7slA3n+hsX+W7j48mBXfmnwLPkK4HTWiP5gpnXusiJeWHwTxcO9Z0Mh6r9ePPcinuCNifodLU XqJLgGG5cTFUM1YJ50joF5MuG+R3dwJN1cDNeC2fVXKhzqA4bayEPjHAw0ZXvTHbbdUFyo7R1zCVy bZkGp6bdHUhZyEu3Qw4xuyZhNdaqsL5Mb6/77gDVN4ghs39skuVxyPq2bExX3Wek64IN+8sW9fkJ6 8Esn3V17GPdRr5Q4uM/fQKDAcqH3NlfUjILBEtn8YhsrO6LmfP/0dgCzDE69s0AhsBR4TCFt9MBgF Myc8my5Q==; Received: from [192.168.2.1] (port=59434 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp3f-0004Bd-2D; Mon, 06 Feb 2023 05:38:32 +0530 From: Arun Isaac Date: Mon, 6 Feb 2023 00:08:18 +0000 Message-Id: <20230206000819.32172-4-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230206000819.32172-1-arunisaac@systemreboot.net> References: <20230206000819.32172-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * src/guile/skribilo/engine/html.scm (toc): Use match instead of car and cdr. --- src/guile/skribilo/engine/html.scm | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 367eb3c..e9293e6 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -1089,34 +1089,34 @@ (display "") (loop (+ i 1)))))) (define (toc-entry fe level) - (let* ((c (car fe)) - (ch (cdr fe)) - (id (markup-ident c)) - (f (html-file c e))) - (unless (string? id) + (match fe + ((c ch ...) + (let ((id (markup-ident c)) + (f (html-file c e))) + (unless (string? id) (skribe-error 'toc (format #f "invalid identifier '~a'" id) c)) - (display " ") - ;; blank columns - (col level) - ;; number - (format #t "~a" - (html-container-number c e)) - ;; title - (format #t "" - (- 4 level)) - (format #t "" - (if (and (*destination-file*) - (string=? f (*destination-file*))) - "" - (strip-ref-base (or f (*destination-file*) ""))) - (string-canonicalize id)) - (output (markup-option c :title) e) - (display "") - (display "\n") - ;; the children - (for-each (lambda (n) (toc-entry n (+ 1 level))) ch))) + (display " ") + ;; blank columns + (col level) + ;; number + (format #t "~a" + (html-container-number c e)) + ;; title + (format #t "" + (- 4 level)) + (format #t "" + (if (and (*destination-file*) + (string=? f (*destination-file*))) + "" + (strip-ref-base (or f (*destination-file*) ""))) + (string-canonicalize id)) + (output (markup-option c :title) e) + (display "") + (display "\n") + ;; the children + (for-each (lambda (n) (toc-entry n (+ 1 level))) ch))))) (let* ((c (markup-option n :chapter)) (s (markup-option n :section)) -- 2.38.1 From unknown Fri Aug 15 15:56:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61306: [PATCH 3/5] html: Do not add br tags before footnotes. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: skribilo-bugs@nongnu.org Resent-Date: Mon, 06 Feb 2023 00:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61306 X-GNU-PR-Package: skribilo X-GNU-PR-Keywords: patch To: 61306@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 61306-submit@debbugs.gnu.org id=B61306.167564211726743 (code B ref 61306); Mon, 06 Feb 2023 00:09:03 +0000 Received: (at 61306) by debbugs.gnu.org; 6 Feb 2023 00:08:37 +0000 Received: from localhost ([127.0.0.1]:46752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3k-0006xD-UA for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:37 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:49056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3g-0006wZ-US for 61306@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QcR52MdGeYeboyGjKyAESENv29K7AzCklhdzth//FCM=; b=Yk489Cqlp3ydR0AGQlE+nHUgyG Kf3TRbtCMp/ab145hryGs1+SriDLXO4GkGTsmJvC3RXd8B0tYt4bPLVURMaR0xvicTcVrNqUntyh6 2rBUuk6a666Ozmk4PTNNbUbX/OdPgAorVtn24xLz/hdw7sMy0mvC3L2EYAXE9XX2mliLAsbcce0Ah KPtIoS2BdY6PRIQeUfLgJUMJfmJRmwMdOGVeornT6IEKUcLTFf8Hv/dUDPOxo7QxxucfUHOFqpkyf +iYd/p61Gvuueor2Gd2sAO2cR7vcpKg34NWs6PQTSoDhYrP/YkFOTPTgaIOwrYGDS7wYIGWLB8pcv lnd1sfUA==; Received: from [192.168.2.1] (port=59434 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp3e-0004Bd-1g; Mon, 06 Feb 2023 05:38:30 +0530 From: Arun Isaac Date: Mon, 6 Feb 2023 00:08:17 +0000 Message-Id: <20230206000819.32172-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230206000819.32172-1-arunisaac@systemreboot.net> References: <20230206000819.32172-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * src/guile/skribilo/engine/html.scm (&html-footnotes): Do not add br tags before. --- src/guile/skribilo/engine/html.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 2ab5117..367eb3c 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -937,7 +937,6 @@ (let ((footnotes (markup-body n))) (when (pair? footnotes) (display "
") - (display "

\n") (display "
\n")))) :action (lambda (n e) (let ((footnotes (markup-body n))) -- 2.38.1 From unknown Fri Aug 15 15:56:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61306: [PATCH 5/5] html: Use for-each instead of explicit loop. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: skribilo-bugs@nongnu.org Resent-Date: Mon, 06 Feb 2023 00:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61306 X-GNU-PR-Package: skribilo X-GNU-PR-Keywords: patch To: 61306@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 61306-submit@debbugs.gnu.org id=B61306.167564212026754 (code B ref 61306); Mon, 06 Feb 2023 00:09:04 +0000 Received: (at 61306) by debbugs.gnu.org; 6 Feb 2023 00:08:40 +0000 Received: from localhost ([127.0.0.1]:46755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3o-0006xS-7V for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:40 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:49066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp3k-0006wy-MJ for 61306@debbugs.gnu.org; Sun, 05 Feb 2023 19:08:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=yeO5bzxH1nZILSr8VdMV4S1ho2rUE/1okHpJWFQiPfo=; b=Jtvu/2iP0n/AV6bH9rtpLPlUdi hhV+5eQ994bK7oxUCMhy3/UgZoSxMFNmIjTwJUghNqh+JdwWCCwMD5Wz9NfgjhxAKeIkUeD5tSbz7 8HGzZt8mVm3kZrpASeCnRYwDZVPsDmiJpVsWlnmirRhrLPe7MZTe0DQq7FtJD/LiOb75kPrdFkD0F JeKQc9YaMxM3V1uCfh8euSc7lg5sNKPpMuiIQuSomgk+8vNXtFsaGIOu/ZT6OW3xof+/Z4v36dfAA QQ8EUvEL6UwDT4LN1/RVkhkDWWuXpKyXyqoeeKz0QQxzKI/rDYyEQi2rCo7GjgbYMhRaDs+KLKr8T uZwN9QTA==; Received: from [192.168.2.1] (port=59434 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp3h-0004Bd-16; Mon, 06 Feb 2023 05:38:33 +0530 From: Arun Isaac Date: Mon, 6 Feb 2023 00:08:19 +0000 Message-Id: <20230206000819.32172-5-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230206000819.32172-1-arunisaac@systemreboot.net> References: <20230206000819.32172-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * src/guile/skribilo/engine/html.scm (&html-footnotes): Use for-each instead of explicit loop. --- src/guile/skribilo/engine/html.scm | 41 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index e9293e6..da40475 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -939,27 +939,26 @@ (display "
") (display "
\n")))) :action (lambda (n e) - (let ((footnotes (markup-body n))) - (when (pair? footnotes) - (let loop ((fns footnotes)) - (if (pair? fns) - (let ((fn (car fns))) - (display "\n
") - - ;; Note: the tags must not be nested. - (format #t "" - (string-canonicalize - (container-ident fn))) - (format #t "" - (string-canonicalize - (container-ident fn))) - (format #t "~a" - (markup-option fn :label)) - (output (markup-body fn) e) - - (display "\n
\n") - (loop (cdr fns))))) - (display "
"))))) + (let ((footnotes (markup-body n))) + (for-each (lambda (fn) + (display "\n
") + + ;; Note: the tags must not be nested. + + (format #t "" + (string-canonicalize + (container-ident fn))) + (format #t "" + (string-canonicalize + (container-ident fn))) + (format #t "~a" + (markup-option fn :label)) + (output (markup-body fn) e) + + (display "\n
\n")) + footnotes) + (when (pair? footnotes) + (display "
"))))) ;*---------------------------------------------------------------------*/ ;* html-title-authors ... */ -- 2.38.1 From unknown Fri Aug 15 15:56:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Arun Isaac Subject: bug#61306: closed (Re: bug#61306: Acknowledgement ([PATCH 0/5] Modernize the html engine)) Message-ID: References: <87o7pe1wya.fsf@systemreboot.net> <20230206000626.31832-1-arunisaac@systemreboot.net> X-Gnu-PR-Message: they-closed 61306 X-Gnu-PR-Package: skribilo X-Gnu-PR-Keywords: patch Reply-To: 61306@debbugs.gnu.org Date: Tue, 28 Feb 2023 00:00:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1677542403-19452-1" This is a multi-part message in MIME format... ------------=_1677542403-19452-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #61306: [PATCH 0/5] Modernize the html engine which was filed against the skribilo package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 61306@debbugs.gnu.org. --=20 61306: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D61306 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1677542403-19452-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 61306-done) by debbugs.gnu.org; 27 Feb 2023 23:59:55 +0000 Received: from localhost ([127.0.0.1]:49227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWnPO-000539-W3 for submit@debbugs.gnu.org; Mon, 27 Feb 2023 18:59:55 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:43542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWnPK-00052v-Aj for 61306-done@debbugs.gnu.org; Mon, 27 Feb 2023 18:59:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=t3O0QD1CDq4YYQtK310JYOGkhgWQ4hEAv1zwaPm3IYk=; b=kX6SKdU55HYSBehLgkmpe2HGIi KhZClft9UCqX9OiE1PJCK/qu/brujfgLbVueZTlFTeFILnPhPhVHrzjVu73/9tg9jWU6js9Arttwi /xNwR2EBRIWPhE0XXlm7QRdNueLVTwMhBvNMOv24ZEOJ65RvF8I2BO5b6nPYbcpFQO6I6VoUz4ZEK hxus0qb5DjFFof44qkfLTW2csrq5Q5l9u2XRvpjZIm6WwKV13jnv2o4rC30b5uBpSOTfu46DVH+m8 vXm5VfS9jnVDye5hGcNZmuw9IAk00cTbSHrSw/VeX3h61Ul5Yw9dhjyFSQvWuufIilD7mKwQeoobz NT8NNEzA==; Received: from [192.168.2.1] (port=51612 helo=localhost) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pWnPF-000YjL-0z for 61306-done@debbugs.gnu.org; Tue, 28 Feb 2023 05:29:46 +0530 From: Arun Isaac To: 61306-done@debbugs.gnu.org Subject: Re: bug#61306: Acknowledgement ([PATCH 0/5] Modernize the html engine) In-Reply-To: References: <20230206000626.31832-1-arunisaac@systemreboot.net> Date: Mon, 27 Feb 2023 23:59:41 +0000 Message-ID: <87o7pe1wya.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61306-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Pushed! ------------=_1677542403-19452-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 6 Feb 2023 00:06:46 +0000 Received: from localhost ([127.0.0.1]:46734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp1y-0006t1-23 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:06:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:43092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOp1w-0006st-H7 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 19:06:44 -0500 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 1pOp1t-0003yk-NY for skribilo-bugs@nongnu.org; Sun, 05 Feb 2023 19:06:44 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOp1r-0006A0-WF for skribilo-bugs@nongnu.org; Sun, 05 Feb 2023 19:06:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mz4KuntclaPTmyZaRRKvp97w3n+9Y/jnk614oKcbmZo=; b=E1t1GDaR1eDZMxMbfyVK6mDkL7 BEgj4FrS0x3OCCirzHrco5i+CVWggAKk8Rvq+rF3iDAtWMIlX64p4Kt61P4g7e6ACb6z0tBZsd/OK Pyou7mdsdtM/dCa2/+69TzpO+zNAzlSkHf3hDfm+zDIVa5eTczdSkEmIPYAEhEmELpLXbyv0MJXM5 BAYb1x9ZvISNe4EBEfimnfV/tS9T/Js182nCwOcKEVM+15/eey6eVMSUGZPpsOoEwGQ1Nbha1hxd5 Ru7Gh7jXIbE8d7OA1wWM4YXawM2UMnwuWpMwNE6zSIBwG6PwMPJT/fhosjq2Rdfzd5uP37HJ+jJml G24VMuWQ==; Received: from [192.168.2.1] (port=44684 helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pOp1n-0004BE-1g; Mon, 06 Feb 2023 05:36:35 +0530 From: Arun Isaac To: skribilo-bugs@nongnu.org Subject: [PATCH 0/5] Modernize the html engine Date: Mon, 6 Feb 2023 00:06:26 +0000 Message-Id: <20230206000626.31832-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=139.59.75.54; envelope-from=arunisaac@systemreboot.net; helo=mugam.systemreboot.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This patchset adds a bunch of modernization fixes to the html engine. Mainly: - It removes br tags from various places. There is no need for br tags. Presentation should be handled in CSS. br tags insert unneeded unremovable space. - Modernize code to use match and for-each. Arun Isaac (5): html: Do not add br tag after chapter. html: Do not add br tag after section. html: Do not add br tags before footnotes. html: Use match instead of car and cdr. html: Use for-each instead of explicit loop. src/guile/skribilo/engine/html.scm | 99 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 51 deletions(-) -- 2.38.1 ------------=_1677542403-19452-1--