From unknown Mon Aug 18 17:55:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64234: patch: Ensure that makeinfo =?UTF-8?Q?=E2=89=A5?= 6.8 checks the @menu structure Resent-From: Bruno Haible Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Thu, 22 Jun 2023 22:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64234 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 64234@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16874733759392 (code B ref -1); Thu, 22 Jun 2023 22:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Jun 2023 22:36:15 +0000 Received: from localhost ([127.0.0.1]:36937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCSuV-0002RQ-B7 for submit@debbugs.gnu.org; Thu, 22 Jun 2023 18:36:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:53808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCSuT-0002RI-25 for submit@debbugs.gnu.org; Thu, 22 Jun 2023 18:36:13 -0400 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 1qCSuS-0006Pp-Rt for bug-diffutils@gnu.org; Thu, 22 Jun 2023 18:36:12 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.161]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCSuQ-0007vM-Fv for bug-diffutils@gnu.org; Thu, 22 Jun 2023 18:36:12 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1687473367; cv=none; d=strato.com; s=strato-dkim-0002; b=AoGo4xGsqQf83pwW12gQcetdTjvFHfNzjZGl3zp0f2I61xZGbq7ZiEZpbWSEqo9SXy OBq1f57lhJ/+eVk4ThWWBxS74w7S5KanB/z/x4F3gm1DP50dpO1O0Hg//XkAJReAwfUQ TJ8xm5pChYMZ3K0GuH3jJYvulZ76BwiwLWbDFdjgAILwPn6lkoTiuugTxevg55NSdj+n Kn1yMCcLgBuL13XgwHkEEKbrQ2alcLbDTrmX06jcgRZDS/UZu24YM5wawEUGI7M08V46 c0ia0QvwClmz8oOZzGbmI4CNc1mHIwYweOwelyf/iGqYzpIp4/fIsGBZsbnHr3rwsZ7W 4KAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687473367; s=strato-dkim-0002; d=strato.com; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=zoPlFfN9YGr5tL7oTJP2LTMeeufrMwnAglDJqE68pso=; b=VEUmt3xCs0/6dUkllJtJhEpgoKee9Q0iu9EqHQJMW+aJ/evIerXEeN8GSsMtXB6RKh 3KmVUAwljYlTg4GIQcl2uHtBkxl+yxXDTMUjELT4jhxjqmSI/gcu2XhzDXXqHUFjhZ2O 9ZApJUlagtotXbdATcb9jfa1N4inqrpjBPjhS/bHFUKnEhAegk97/2By4X2oLI+b4HHy yMpwnLS9vgtmxKpqlxZ/QMy3Qp/vC0Zev39wJWE9JEI0Feu5a/yC+5PRYslKsWnNrqIC d56s/G+0qeytlSx/wCfOvIFyjO3tweqYZusyoflV4+10RJulDCl1x/p0mY2M4KCosjYs H93w== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687473367; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=zoPlFfN9YGr5tL7oTJP2LTMeeufrMwnAglDJqE68pso=; b=hk4rLbx24MNMPabaQ40r/fQHxcttEAomBg9qX2k7jQ6vFWXCtdp4pSp5VlMyPYCePE bX/aJl3ILeSnnC/4cvFiARNmQG/JkYc6QuQex7B0xUw7NfgMZe6Fx/gBihgAqXhF8fNy w++KVvmZPTu9kcXJjsWtXG7fxSQ9vYE/AljrViQdggA6Yu8GmrXCqTiJzmea2py2+IKH C8+kNgsgQnZ5sm0GVL0Uy0c1wHHxr5oGKg+YE8dbeES8RGC0bpisL+RwXifM9SLi8LxW Eb0K2Ja9S0jKFdZFxodalTdMbPy5RLkBpiYEhtwXfXiQ0p1P+Yf4OI+e+Wb5IEIDmIe5 SI7Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687473367; s=strato-dkim-0003; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=zoPlFfN9YGr5tL7oTJP2LTMeeufrMwnAglDJqE68pso=; b=W8+q5TtJE01Fpr8Lddk25I055yAoiYyR/HHu2GUmUxei/2WRvk5ZXFjn81BhfzMICF VC/wZnA/3m9wTgPLyNCw== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zq68+3cfpOe3vKnz4NASJkKNkZR9T7ssjto" Received: from nimes.localnet by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id 6b0accz5MMa7Tv4 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 23 Jun 2023 00:36:07 +0200 (CEST) From: Bruno Haible Date: Fri, 23 Jun 2023 00:36:07 +0200 Message-ID: <32390400.43St1lv6Oq@nimes> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart4554445.5KxKD5qtyk" Content-Transfer-Encoding: 7Bit Received-SPF: none client-ip=81.169.146.161; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) 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: -3.3 (---) This is a multi-part message in MIME format. --nextPart4554445.5KxKD5qtyk Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Makeinfo versions < 6.7 detected mistakes in the @menu structure of TeXinfo input. Makeinfo versions =E2=89=A5 6.8 don't do this any more by default. T= hey need an extra option, for this validation to happen. See . Since doc/diffutils.texi has a hand-written @menu, it should use this extra option. Here's a patch to that effect. There are two possibilities for adding the extra option: - in the MAKEINFO variable, where it has an effect on both "makeinfo" and "makeinfo --html", - in the AM_MAKEINFOFLAGS variable, where it has an effect on "makeinfo" only. Since some maintainers may check their documentation edits only by regenera= ting the HTML-formatted documentation, the first choice is preferrable. Tested by running touch doc/diffutils.texi ; (cd doc && make diffutils.info V=3D1) and make sc_makefile_at_at_check --nextPart4554445.5KxKD5qtyk Content-Disposition: attachment; filename="0001-build-Ensure-that-makeinfo-6.8-checks-the-menu-struc.patch" Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset="UTF-8"; name="0001-build-Ensure-that-makeinfo-6.8-checks-the-menu-struc.patch" =46rom 4938fa8767bf56521eaa96b0b7991ee74cc18458 Mon Sep 17 00:00:00 2001 =46rom: Bruno Haible Date: Fri, 23 Jun 2023 00:29:28 +0200 Subject: [PATCH] =3D?UTF-8?q?build:=3D20Ensure=3D20that=3D20makeinfo=3D20= =3DE2=3D89=3DA5?=3D =3D?UTF-8?q?=3D206.8=3D20checks=3D20the=3D20@menu=3D20structure?=3D MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit See . * doc/Makefile.am (MAKEINFO): New variable. * cfg.mk (_makefile_at_at_check_exceptions): New variable. =2D-- cfg.mk | 3 +++ doc/Makefile.am | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/cfg.mk b/cfg.mk index 3713860..83d454e 100644 =2D-- a/cfg.mk +++ b/cfg.mk @@ -42,6 +42,9 @@ old_NEWS_hash =3D d6a8096805f9b3ee162842058477f0bc # via diff.h or system.h. config_h_header =3D (|"(diff|system)\.h") =20 +# Add an exemption for sc_makefile_at_at_check. +_makefile_at_at_check_exceptions =3D ' && !/MAKEINFO/' + update-copyright-env =3D \ UPDATE_COPYRIGHT_USE_INTERVALS=3D1 \ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=3D79 diff --git a/doc/Makefile.am b/doc/Makefile.am index 300617e..8166ab0 100644 =2D-- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,6 +15,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 + +# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with +# makeinfo versions =E2=89=A5 6.8. +MAKEINFO =3D @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=3D1 + AM_MAKEINFOFLAGS =3D --no-split =20 info_TEXINFOS =3D diffutils.texi =2D-=20 2.34.1 --nextPart4554445.5KxKD5qtyk-- From unknown Mon Aug 18 17:55:27 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: Bruno Haible Subject: bug#64234: closed (Re: [bug-diffutils] bug#64234: patch: Ensure that makeinfo =?UTF-8?Q?=E2=89=A5?= 6.8 checks the @menu structure) Message-ID: References: <32390400.43St1lv6Oq@nimes> X-Gnu-PR-Message: they-closed 64234 X-Gnu-PR-Package: diffutils Reply-To: 64234@debbugs.gnu.org Date: Sun, 25 Jun 2023 01:10:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1687655402-28008-1" This is a multi-part message in MIME format... ------------=_1687655402-28008-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64234: patch: Ensure that makeinfo =E2=89=A5 6.8 checks the @menu structure which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64234@debbugs.gnu.org. --=20 64234: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64234 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1687655402-28008-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64234-done) by debbugs.gnu.org; 25 Jun 2023 01:09:04 +0000 Received: from localhost ([127.0.0.1]:41738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDEFT-0007GP-9K for submit@debbugs.gnu.org; Sat, 24 Jun 2023 21:09:04 -0400 Received: from mail-lf1-f46.google.com ([209.85.167.46]:54486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDEFN-0007Fp-E4 for 64234-done@debbugs.gnu.org; Sat, 24 Jun 2023 21:09:01 -0400 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-4f7677a94d1so2754125e87.0 for <64234-done@debbugs.gnu.org>; Sat, 24 Jun 2023 18:08:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687655331; x=1690247331; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SB0xJlAR/qUtd/S85Sj0dYrcpgNXClMV8zB7JdVTOOI=; b=im08oXm35uiENqIWBBII1m2kR87xT6Y/ci0nlCg2yfUF3PRdGarjflPwFZD7Lq9KN9 p/dJXRFiVHSymHpYVQB0doDBDtCWRqc8Hu4MrWGQOaptUK1EanS0F5M5kL3YgHpTqQ4Q DzYTpfHoTLxhHxfoiOfljENnQEVhTob41Pux9HVMPTLaNnseuCL/CjQRK19IlQblwva8 ncAJd/T1CkkkxsdZgagWS+2UnkiTIEidSvlU1HXzF07K28Gv54gcaY7do6plS12LJub7 tRYccyiPfi1aQv3h/8QaoqNrUKXm7nJomoRyVhPMzMT8w4uvR2Ln8a1YOD7NXuPkRALg gO8A== X-Gm-Message-State: AC+VfDzHzWk+iluHoSJWZmaEMqVXqtBgifD6Q6USUZOn33EGPe8hv5V2 osViK7pqJS1OoHIaPWKcQSJh/5I9uwh/es7EEV4= X-Google-Smtp-Source: ACHHUZ6esJKCGyiwGPsUeJWqiOMWlmRtVJfd/zam5WFUShTdIjwTF/ZMmmJQqpuQ+mA24FPYki5AsmDQlytcmBdLbXg= X-Received: by 2002:a05:6512:3d94:b0:4f9:5d8d:ccb8 with SMTP id k20-20020a0565123d9400b004f95d8dccb8mr8470525lfv.17.1687655331143; Sat, 24 Jun 2023 18:08:51 -0700 (PDT) MIME-Version: 1.0 References: <32390400.43St1lv6Oq@nimes> In-Reply-To: <32390400.43St1lv6Oq@nimes> From: Jim Meyering Date: Sat, 24 Jun 2023 18:08:38 -0700 Message-ID: Subject: =?UTF-8?Q?Re=3A_=5Bbug=2Ddiffutils=5D_bug=2364234=3A_patch=3A_Ensure_that_ma?= =?UTF-8?Q?keinfo_=E2=89=A5_6=2E8_checks_the_=40menu_structure?= To: Bruno Haible Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 64234-done Cc: 64234-done@debbugs.gnu.org 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: -0.8 (/) On Thu, Jun 22, 2023 at 4:55=E2=80=AFPM Bruno Haible wrot= e: > Makeinfo versions < 6.7 detected mistakes in the @menu structure of TeXin= fo > input. Makeinfo versions =E2=89=A5 6.8 don't do this any more by default.= They need > an extra option, for this validation to happen. See > . > > Since doc/diffutils.texi has a hand-written @menu, it should use this ext= ra > option. > > Here's a patch to that effect. > > There are two possibilities for adding the extra option: > - in the MAKEINFO variable, where it has an effect on both "makeinfo" > and "makeinfo --html", > - in the AM_MAKEINFOFLAGS variable, where it has an effect on "makeinfo= " > only. > Since some maintainers may check their documentation edits only by regene= rating > the HTML-formatted documentation, the first choice is preferrable. > > Tested by running > touch doc/diffutils.texi ; (cd doc && make diffutils.info V=3D1) > and > make sc_makefile_at_at_check Thank you. Pushed. ------------=_1687655402-28008-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Jun 2023 22:36:15 +0000 Received: from localhost ([127.0.0.1]:36937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCSuV-0002RQ-B7 for submit@debbugs.gnu.org; Thu, 22 Jun 2023 18:36:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:53808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCSuT-0002RI-25 for submit@debbugs.gnu.org; Thu, 22 Jun 2023 18:36:13 -0400 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 1qCSuS-0006Pp-Rt for bug-diffutils@gnu.org; Thu, 22 Jun 2023 18:36:12 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.161]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCSuQ-0007vM-Fv for bug-diffutils@gnu.org; Thu, 22 Jun 2023 18:36:12 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1687473367; cv=none; d=strato.com; s=strato-dkim-0002; b=AoGo4xGsqQf83pwW12gQcetdTjvFHfNzjZGl3zp0f2I61xZGbq7ZiEZpbWSEqo9SXy OBq1f57lhJ/+eVk4ThWWBxS74w7S5KanB/z/x4F3gm1DP50dpO1O0Hg//XkAJReAwfUQ TJ8xm5pChYMZ3K0GuH3jJYvulZ76BwiwLWbDFdjgAILwPn6lkoTiuugTxevg55NSdj+n Kn1yMCcLgBuL13XgwHkEEKbrQ2alcLbDTrmX06jcgRZDS/UZu24YM5wawEUGI7M08V46 c0ia0QvwClmz8oOZzGbmI4CNc1mHIwYweOwelyf/iGqYzpIp4/fIsGBZsbnHr3rwsZ7W 4KAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1687473367; s=strato-dkim-0002; d=strato.com; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=zoPlFfN9YGr5tL7oTJP2LTMeeufrMwnAglDJqE68pso=; b=VEUmt3xCs0/6dUkllJtJhEpgoKee9Q0iu9EqHQJMW+aJ/evIerXEeN8GSsMtXB6RKh 3KmVUAwljYlTg4GIQcl2uHtBkxl+yxXDTMUjELT4jhxjqmSI/gcu2XhzDXXqHUFjhZ2O 9ZApJUlagtotXbdATcb9jfa1N4inqrpjBPjhS/bHFUKnEhAegk97/2By4X2oLI+b4HHy yMpwnLS9vgtmxKpqlxZ/QMy3Qp/vC0Zev39wJWE9JEI0Feu5a/yC+5PRYslKsWnNrqIC d56s/G+0qeytlSx/wCfOvIFyjO3tweqYZusyoflV4+10RJulDCl1x/p0mY2M4KCosjYs H93w== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1687473367; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=zoPlFfN9YGr5tL7oTJP2LTMeeufrMwnAglDJqE68pso=; b=hk4rLbx24MNMPabaQ40r/fQHxcttEAomBg9qX2k7jQ6vFWXCtdp4pSp5VlMyPYCePE bX/aJl3ILeSnnC/4cvFiARNmQG/JkYc6QuQex7B0xUw7NfgMZe6Fx/gBihgAqXhF8fNy w++KVvmZPTu9kcXJjsWtXG7fxSQ9vYE/AljrViQdggA6Yu8GmrXCqTiJzmea2py2+IKH C8+kNgsgQnZ5sm0GVL0Uy0c1wHHxr5oGKg+YE8dbeES8RGC0bpisL+RwXifM9SLi8LxW Eb0K2Ja9S0jKFdZFxodalTdMbPy5RLkBpiYEhtwXfXiQ0p1P+Yf4OI+e+Wb5IEIDmIe5 SI7Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1687473367; s=strato-dkim-0003; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=zoPlFfN9YGr5tL7oTJP2LTMeeufrMwnAglDJqE68pso=; b=W8+q5TtJE01Fpr8Lddk25I055yAoiYyR/HHu2GUmUxei/2WRvk5ZXFjn81BhfzMICF VC/wZnA/3m9wTgPLyNCw== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zq68+3cfpOe3vKnz4NASJkKNkZR9T7ssjto" Received: from nimes.localnet by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id 6b0accz5MMa7Tv4 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 23 Jun 2023 00:36:07 +0200 (CEST) From: Bruno Haible To: bug-diffutils@gnu.org Subject: patch: Ensure that makeinfo =?UTF-8?B?4oml?= 6.8 checks the @menu structure Date: Fri, 23 Jun 2023 00:36:07 +0200 Message-ID: <32390400.43St1lv6Oq@nimes> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart4554445.5KxKD5qtyk" Content-Transfer-Encoding: 7Bit Received-SPF: none client-ip=81.169.146.161; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit 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: -3.3 (---) This is a multi-part message in MIME format. --nextPart4554445.5KxKD5qtyk Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Makeinfo versions < 6.7 detected mistakes in the @menu structure of TeXinfo input. Makeinfo versions =E2=89=A5 6.8 don't do this any more by default. T= hey need an extra option, for this validation to happen. See . Since doc/diffutils.texi has a hand-written @menu, it should use this extra option. Here's a patch to that effect. There are two possibilities for adding the extra option: - in the MAKEINFO variable, where it has an effect on both "makeinfo" and "makeinfo --html", - in the AM_MAKEINFOFLAGS variable, where it has an effect on "makeinfo" only. Since some maintainers may check their documentation edits only by regenera= ting the HTML-formatted documentation, the first choice is preferrable. Tested by running touch doc/diffutils.texi ; (cd doc && make diffutils.info V=3D1) and make sc_makefile_at_at_check --nextPart4554445.5KxKD5qtyk Content-Disposition: attachment; filename="0001-build-Ensure-that-makeinfo-6.8-checks-the-menu-struc.patch" Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset="UTF-8"; name="0001-build-Ensure-that-makeinfo-6.8-checks-the-menu-struc.patch" =46rom 4938fa8767bf56521eaa96b0b7991ee74cc18458 Mon Sep 17 00:00:00 2001 =46rom: Bruno Haible Date: Fri, 23 Jun 2023 00:29:28 +0200 Subject: [PATCH] =3D?UTF-8?q?build:=3D20Ensure=3D20that=3D20makeinfo=3D20= =3DE2=3D89=3DA5?=3D =3D?UTF-8?q?=3D206.8=3D20checks=3D20the=3D20@menu=3D20structure?=3D MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit See . * doc/Makefile.am (MAKEINFO): New variable. * cfg.mk (_makefile_at_at_check_exceptions): New variable. =2D-- cfg.mk | 3 +++ doc/Makefile.am | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/cfg.mk b/cfg.mk index 3713860..83d454e 100644 =2D-- a/cfg.mk +++ b/cfg.mk @@ -42,6 +42,9 @@ old_NEWS_hash =3D d6a8096805f9b3ee162842058477f0bc # via diff.h or system.h. config_h_header =3D (|"(diff|system)\.h") =20 +# Add an exemption for sc_makefile_at_at_check. +_makefile_at_at_check_exceptions =3D ' && !/MAKEINFO/' + update-copyright-env =3D \ UPDATE_COPYRIGHT_USE_INTERVALS=3D1 \ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=3D79 diff --git a/doc/Makefile.am b/doc/Makefile.am index 300617e..8166ab0 100644 =2D-- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,6 +15,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 + +# The customization variable CHECK_NORMAL_MENU_STRUCTURE is necessary with +# makeinfo versions =E2=89=A5 6.8. +MAKEINFO =3D @MAKEINFO@ -c CHECK_NORMAL_MENU_STRUCTURE=3D1 + AM_MAKEINFOFLAGS =3D --no-split =20 info_TEXINFOS =3D diffutils.texi =2D-=20 2.34.1 --nextPart4554445.5KxKD5qtyk-- ------------=_1687655402-28008-1--