From patchwork Thu Apr 13 11:57:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210233 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F99AC77B61 for ; Thu, 13 Apr 2023 11:57:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230312AbjDML5v (ORCPT ); Thu, 13 Apr 2023 07:57:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbjDML5t (ORCPT ); Thu, 13 Apr 2023 07:57:49 -0400 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAFAB2D46 for ; Thu, 13 Apr 2023 04:57:48 -0700 (PDT) Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-329627dabfbso2160275ab.0 for ; Thu, 13 Apr 2023 04:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387068; x=1683979068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6Y2MeFhvA5g7wm+r14vXppbes/c6GT5tCrJK1YCMJcU=; b=WZeSOPRl8tyYU9TwFhdzeVBoVUw2GE0mbzUO7G2D0cXEfuwWETHdbgK0n+UN7csAo5 0KIZwmSH4eEV0Cne9bik16jfRvwLquk/4F3MKOTW0LaXM1tsTa9sUWwpLldMxJLvXIxn Xe6sPDwfg2I4i4BiTGrhI3thDbKSIK0qWa8MrPxsgcXXR1a0Ojg6trQRm73009y+oYUk deGZLsbFBbatf2AvWgIkj8RniQGski3fu8v5V6+B8eE+BOlUB3QMbJRUbFrtBSjTsUDL 5Q8laui6MxNNEEBqaV04T4JN9nyWzLDiMu3Fyt/86iyAbE9JEOKh426FjmdE1bNCGW0J LX0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387068; x=1683979068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6Y2MeFhvA5g7wm+r14vXppbes/c6GT5tCrJK1YCMJcU=; b=I9VknHGPdya0POcUh5ROl6POWz+0coNCaBXZA03HKg2lKm+8oqOrVhoKm59lgwX6QJ XbofFkCYO7smCtWD7CTNHqsrWZIjtpAwzf8iN4N6xxSkMc/tsaUAJ9kNX3T1Qrjxob4h g35Dwckc76MlOxLfntnezcLuzIX1o/6M726BPBNeDkUss3MWHvC43O4Hf+ZxPM5WXX6Q nV5J/k7ltaH1mNM295F4JHh107LHHiuMGrLJsddzIr8BpDerVWh7JGTlyOXpUMgiOaMR p0279/hYhRWDbhDMK5xiBcfyRl3b1JqU76ZMDIYcYnVbK/LotRC+8WfmV/2f/tLIqHCA RxnA== X-Gm-Message-State: AAQBX9fYrucVXsMgNglpMgn6a4WHoI54Lr3BXkKQJNhrd0Y9Gfv7MmKL +iW7BFZNUh+dK64dbdYXmL8pBoP9aec= X-Google-Smtp-Source: AKy350ZUqAnuLNBPmpeneRkn+GAwN4f6Zc0KJBuaNfzsXvdYDic5Usq33Zd9CKdiqmW/P3+jIFyc/g== X-Received: by 2002:a05:6e02:927:b0:329:4142:e9ff with SMTP id o7-20020a056e02092700b003294142e9ffmr1085534ilt.10.1681387067873; Thu, 13 Apr 2023 04:57:47 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id b18-20020a92a052000000b003159b6d97d6sm384579ilm.52.2023.04.13.04.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:47 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 01/12] doc: add test for doc tools output Date: Thu, 13 Apr 2023 05:57:34 -0600 Message-Id: <20230413115745.116063-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- t/t0600-doc-tools.sh | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 t/t0600-doc-tools.sh diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh new file mode 100755 index 0000000000..0f9a4053a9 --- /dev/null +++ b/t/t0600-doc-tools.sh @@ -0,0 +1,91 @@ +#!/bin/sh + +test_description='Check the output of documentation tools' + +. ./test-lib.sh + +doc_dir="$GIT_BUILD_DIR/Documentation" + +command -v asciidoc >/dev/null && test_set_prereq ASCIIDOC +command -v asciidoctor >/dev/null && test_set_prereq ASCIIDOCTOR + +cat >git-foo.txt <] + +DESCRIPTION +----------- +description + +GIT +--- +Part of the linkgit:git[1] suite +EOF + +cat >git-foo.1.expected <] +.fi +.sp +.SH "DESCRIPTION" +.sp +description +.SH "GIT" +.sp +Part of the \fBgit\fR(1) suite +EOF + +xmltoman() { + base="$1" + shift + xmlto --skip-validation -m "$doc_dir/manpage-normal.xsl" -m "$doc_dir/manpage-bold-literal.xsl" "$@" man "$base.xml" +} + +build_asciidoc_py() { + asciidoc -f "$doc_dir/asciidoc.conf" -amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b docbook -d manpage \ + -o "$1.xml" "$1.txt" && + xmltoman "$1" +} + +build_asciidoctor() { + asciidoctor -acompat-mode -atabsize=8 -I "$doc_dir" -rasciidoctor-extensions -alitdd='--' \ + -amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b docbook5 -d manpage \ + -o "$1.xml" "$1.txt" && + xmltoman "$1" -x "$doc_dir"/manpage.xsl +} + +check_manpage() { + sed -e '/^\.\\"/d' -e '/^$/d' "$1.1" >"$1.1.actual" && + test_cmp "$1.1.expected" "$1.1.actual" +} + +test_expect_failure ASCIIDOC 'legacy asciidoc.py' ' + build_asciidoc_py "git-foo" && + check_manpage "git-foo" +' + +test_expect_failure ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' + build_asciidoctor "git-foo" && + check_manpage "git-foo" +' + +test_done From patchwork Thu Apr 13 11:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210234 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5E35C77B61 for ; Thu, 13 Apr 2023 11:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230383AbjDML5y (ORCPT ); Thu, 13 Apr 2023 07:57:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbjDML5v (ORCPT ); Thu, 13 Apr 2023 07:57:51 -0400 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A70C26BC for ; Thu, 13 Apr 2023 04:57:50 -0700 (PDT) Received: by mail-il1-x136.google.com with SMTP id e9e14a558f8ab-32a249b416fso2533885ab.1 for ; Thu, 13 Apr 2023 04:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387069; x=1683979069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xes3FjJgCuGjh2JdFSJ6DWxb7d1pOy3wg+gVBpDfphc=; b=TqEpDI3auLtchLDfrDiR6HZM8q67UJZQ7RwXWxkVNMdtHgju5RsyiRkf9N8S39wXBm P2sXbd5ZTiwh4HCZbId5uTLZ6GGbu3wwbwkM30r+wRxdfarBa/pCQ1CSw9wk8oM78KtK M+IY6/SfV31B5HeAqZpsYXCzlDXXJhLQohE+VGv+FjlfZexH/01dVDJ/lcdrtGPv5+EE u8l4uMtwG2PQAd2LnOr416qe4aOToU3i1lFl8sNxTUfeOjltRnBjrPcbw59XW3QDnwbX o2hYpDQ4Wz6CsdQOXeu3MCUpX8Vp/05UMDl0qVBapg6IGqzB8nbfTzIevXMRFCa5Lw+f uHSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387069; x=1683979069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xes3FjJgCuGjh2JdFSJ6DWxb7d1pOy3wg+gVBpDfphc=; b=b6YG5hPEkQLHql1rOqgfKQLhFGaoyhGo+GlQYv72K3BexjddeaKWzYL+PzF9PSp5Mv n/01Y9EVEkEAOaBv9IpQHdw7lawAoqeRHWZZBDHEaiiFFQNa+A9xLPIFLkN+8ROLOKcT ZpwUYHTIJleO2ttX1MTZ/OXuJKzK2/amXv4vW/rKNxwP2JC9snWfnpGCuPGOJ8w/9oSP MEgusECf1p+KZ6x0s2URWlLHa1XQDGYmHzIeo0S0Xjkmm6/ENW/X5Td+Rktw3Hx0iA9A 9sEC8C3KvA1f8iDTbpffBeCLzhV+p+ugZfLnR5gkgSUAaO8A24oqxOtGMZ8DqiTIIdWC NoYw== X-Gm-Message-State: AAQBX9dieJ7pCr8p/OyDsYrcoLVaZ3xdpfeG7jN6NQhmDSvSYZ8mSU76 4RuicdAyfomFbAmlbZ0Il9e3CiTsuPM= X-Google-Smtp-Source: AKy350bWGCzun7WNHEyTURyOGS3KFhNNNOEoB4dQmADlSX7Z9yrdMmX0xXRgug1kiQARS67crGuLzA== X-Received: by 2002:a92:c103:0:b0:329:5353:8575 with SMTP id p3-20020a92c103000000b0032953538575mr1397321ile.23.1681387069398; Thu, 13 Apr 2023 04:57:49 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id bt13-20020a056638430d00b0040907e6260asm413570jab.128.2023.04.13.04.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:48 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 02/12] doc: add missing manpage docinfo Date: Thu, 13 Apr 2023 05:57:35 -0600 Message-Id: <20230413115745.116063-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We can remove the whole hack, since asciidoc.py already does that correctly since 2008. Signed-off-by: Felipe Contreras --- Documentation/asciidoc.conf | 3 +++ t/t0600-doc-tools.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 3e4c13971b..303d45dc34 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -56,6 +56,9 @@ ifdef::backend-docbook[] [header] template::[header-declarations] + +template::[docinfo] + {mantitle} {manvolnum} diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index 0f9a4053a9..db77db72e5 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -78,7 +78,7 @@ check_manpage() { test_cmp "$1.1.expected" "$1.1.actual" } -test_expect_failure ASCIIDOC 'legacy asciidoc.py' ' +test_expect_success ASCIIDOC 'legacy asciidoc.py' ' build_asciidoc_py "git-foo" && check_manpage "git-foo" ' From patchwork Thu Apr 13 11:57:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210235 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C9DFC77B6E for ; Thu, 13 Apr 2023 11:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230486AbjDML54 (ORCPT ); Thu, 13 Apr 2023 07:57:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbjDML5w (ORCPT ); Thu, 13 Apr 2023 07:57:52 -0400 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2AA09755 for ; Thu, 13 Apr 2023 04:57:51 -0700 (PDT) Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-32879a8cbe5so2360345ab.3 for ; Thu, 13 Apr 2023 04:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387071; x=1683979071; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4fodCi4KXNxQsZEylyi/LqaMcL76xV59ZSoYwH4S1b0=; b=MLxxtFJ+nTqxKrCjTT0rfkzVpSYTWiXROv/Rt/2xq3gyBvlpaoz7qp3GY1i8zzkDjF CmxMbzIqEjv1fd+uhhvPS40EXjNj91V6UmNNGoJLKERC26DiPUQVwCqgiisTC719NdZs sOQzmnLpNeHYxRBzCmxSelzB80Wo9mecnI361TT45NQqYkqDrJ0mzye+SiueIK2IeeDh qYZtT4aeD5h1E6ynFqT0rla1l7lNgoSE/jVCh4/uayjJgWBVFhizvK+v1qYXzBozdPeI HXQpNi4GYNrTsC8NCgNhF/m75lHVBIBeQ1ZZWNOjsjSPmuPPMal1jV8TLzSeRSZo6SdE 4lqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387071; x=1683979071; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4fodCi4KXNxQsZEylyi/LqaMcL76xV59ZSoYwH4S1b0=; b=iOLx/l8YQ1cJUGrNrx8vIJLDFIlAI/lC+Byev66usKJaKvOX1S/88UU4d/nve+vbz0 aah7CdtfvCQs8YI4fSVSOfhB8/rtuTAVo9QZoWvpNgIo6JcFB02fr0NahCe2mLcyRG52 Gf9drJjark+GMysavJ5vAyRnBJWmt/kARaAbUREP2nMgoLN7U+OJrTBMx8XO8hbQpf1w w6HT3FllDs8dpIz1ivjzvA53UWFnJ1unP28jGlpbmyWu27ONvkUQhKf260wxYCZzHuOz 3k6H22PwSThNYQlTfam6nRL9cqM6GMHFuKx8cpQimuqtwxQhaPBCnK32Q8ecwFjDiaVP 2KQQ== X-Gm-Message-State: AAQBX9cKQ/CUtu2tCDlP3oRLSDMvdBAt5H7Uw9e8nmoBBxRdcTjJPKnY SDLuUILdCf/fOCbR6lqremHK8IBgR+Q= X-Google-Smtp-Source: AKy350YUrr139BUykGDzQvqtj128Zn0RN3ZMRDHRp921MAUZS0D5arpy0jbNmSrU8Sb7ep+7KFPKTQ== X-Received: by 2002:a05:6e02:809:b0:329:5813:8de6 with SMTP id u9-20020a056e02080900b0032958138de6mr1491476ilm.18.1681387070816; Thu, 13 Apr 2023 04:57:50 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id q18-20020a056638239200b0040b27189e8dsm416684jat.116.2023.04.13.04.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:50 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 03/12] doc: remove unnecessary hack for asciidoctor Date: Thu, 13 Apr 2023 05:57:36 -0600 Message-Id: <20230413115745.116063-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It was added in f6461b82b9 (Documentation: fix build with Asciidoctor 2, 2019-09-15) to avoid newlines, but they don't matter. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 1 - Documentation/manpage.xsl | 3 --- t/t0600-doc-tools.sh | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 Documentation/manpage.xsl diff --git a/Documentation/Makefile b/Documentation/Makefile index 5cd35df61c..3fab7ce9cd 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -202,7 +202,6 @@ ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation -XMLTO_EXTRA += -x manpage.xsl endif SHELL_PATH ?= $(SHELL) diff --git a/Documentation/manpage.xsl b/Documentation/manpage.xsl deleted file mode 100644 index ef64bab17a..0000000000 --- a/Documentation/manpage.xsl +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index db77db72e5..a80cd32cd6 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -70,7 +70,7 @@ build_asciidoctor() { asciidoctor -acompat-mode -atabsize=8 -I "$doc_dir" -rasciidoctor-extensions -alitdd='--' \ -amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b docbook5 -d manpage \ -o "$1.xml" "$1.txt" && - xmltoman "$1" -x "$doc_dir"/manpage.xsl + xmltoman "$1" } check_manpage() { @@ -83,7 +83,7 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' -test_expect_failure ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' +test_expect_success ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' build_asciidoctor "git-foo" && check_manpage "git-foo" ' From patchwork Thu Apr 13 11:57:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210236 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 642E7C77B6E for ; Thu, 13 Apr 2023 11:58:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231182AbjDML6C (ORCPT ); Thu, 13 Apr 2023 07:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230458AbjDML5z (ORCPT ); Thu, 13 Apr 2023 07:57:55 -0400 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AA3C9755 for ; Thu, 13 Apr 2023 04:57:53 -0700 (PDT) Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-32a8a5681e0so17735ab.2 for ; Thu, 13 Apr 2023 04:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387072; x=1683979072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s42ck2SGJk+ERguLwEzDQQa9vxCoZOrv3UvRgGEFMfQ=; b=A+Nsu3E4GGAjiQ9gaxFtdqxFxb3fD9beQ4LbBN3SsIQP3YDAa2AmXi2q8g/UUXI+Xc d1hgJ+EAk9wD6kqXj39F1G5t67P+6136IqpR0q1lFFWbTaqu93Spv/DOCX28+b19AYrH KrYxvpXfbPVoW2lgSQADe3bGP0cJdZKSQh/ERCgV8igIkrZErQsWuUuhUxJS89fmYV9M 1BHM17lVKWkvMtAm6hTBvlLrycSuhc+elbyAHpfxyoSOedTNPE6WGBzNsuargNnFxopF eQyjI7gLHgksC29vV+bd2gsQ76QVkppDl0gVFxNYPBCO8g6eOfTvrJX1Mb3R6HXFcz/D 4Tmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387072; x=1683979072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s42ck2SGJk+ERguLwEzDQQa9vxCoZOrv3UvRgGEFMfQ=; b=Foxv/ulsdeshjVRspKTxugXrgm/vA0BW4eygg0gjmFPd5zoQNIPtPK+aZKBQWDLAjt muciNmDdA9iutpTK22q9dCTxBaYNl8vFVdqcKmSoubTprQjMrfkFPdpkMEA0R9v2wQhP qGMtQmUwfw8L6dOHYSuoTRwE8ETSO2wi1iJHC/JZUqLW7otWMxBAf1FXpcZdKzxk9Yjx Vok2lh6GDFqURk3aJZSnBet9gxVquXMPN0WkIvfAKUy110r2Qa+um5NVgL1XKr127n50 y9MJi6ygF29NB9Dakba7Xu4F5PooWKKmt3pb/jWhDzXtEkQnyY5l2FfGDHH6FrdoKZxU /ZJw== X-Gm-Message-State: AAQBX9etFUQaP7TqfWkP6IqxNHC2FTb1MhyZrdwzJ8S2n8xoyiHNB3QB UO2lcK9QIFUywaQ31AazV57E99RqZcY= X-Google-Smtp-Source: AKy350buQaQ4LXdr6i1TSzLI4O4OaskKvM/xMjfUHF/mc+5N6N8Q4XerZElyaet3puvd3cAPmFr0ig== X-Received: by 2002:a92:cc05:0:b0:326:2df9:3f18 with SMTP id s5-20020a92cc05000000b003262df93f18mr1180798ilp.20.1681387072413; Thu, 13 Apr 2023 04:57:52 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id w5-20020a056e0213e500b00326bd11f5d1sm420589ilj.11.2023.04.13.04.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:52 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 04/12] test: doc: add test for docbook5 Date: Thu, 13 Apr 2023 05:57:37 -0600 Message-Id: <20230413115745.116063-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It was released 13 years ago and we still don't support it. Signed-off-by: Felipe Contreras --- t/t0600-doc-tools.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index a80cd32cd6..e4388a54c6 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -61,7 +61,8 @@ xmltoman() { } build_asciidoc_py() { - asciidoc -f "$doc_dir/asciidoc.conf" -amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b docbook -d manpage \ + backend=${2-docbook} + asciidoc -f "$doc_dir/asciidoc.conf" -amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b "$backend" -d manpage \ -o "$1.xml" "$1.txt" && xmltoman "$1" } @@ -83,6 +84,11 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' +test_expect_failure ASCIIDOC 'legacy asciidoc.py (docbook5)' ' + build_asciidoc_py "git-foo" docbook5 && + check_manpage "git-foo" +' + test_expect_success ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' build_asciidoctor "git-foo" && check_manpage "git-foo" From patchwork Thu Apr 13 11:57:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E43ACC77B61 for ; Thu, 13 Apr 2023 11:58:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231207AbjDML6D (ORCPT ); Thu, 13 Apr 2023 07:58:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230493AbjDML6A (ORCPT ); Thu, 13 Apr 2023 07:58:00 -0400 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7391E93FA for ; Thu, 13 Apr 2023 04:57:54 -0700 (PDT) Received: by mail-io1-xd2b.google.com with SMTP id e18so1068136iow.3 for ; Thu, 13 Apr 2023 04:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387074; x=1683979074; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+K0odB5lKl+0QcPtLQzsfKOBZ3BKL/tEJx6vC5skB+I=; b=U6JIohdOvStLZzfMMfMvRYWW5xZu+WeE7wRyQiN2AmxxYQ7CZeXJy/m4KxUi8eH+V4 M3Is00qijWbwKI0lhT6DP09703ZbilQPpUU/+RNWrJe2VicTMOPvqw9LEIXFA4miSsIm 6gOrnrGNuaZlK2/05KToSXPLD3BVwhfupfd2zxb1wfKi8Hf6X5dftjGifqaR2S7HSSnY zMseEM9eD1tSAL7bhwf51kYiKjaIF2LJMY9aWR2oGFhSF5b4cledd1e5GN8Y4mzAdSZi xJXUpT6qdZUGfyalqqZQ27gMO9t58IgYQChlwIPZ9LXC/Zc9aA+XJt/q0o9WFOKp6B+l TS+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387074; x=1683979074; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+K0odB5lKl+0QcPtLQzsfKOBZ3BKL/tEJx6vC5skB+I=; b=J/9+OH00h1CFGD9i0sPlNnoqpiy/CyOLfBQpjwjtJkyjDo+UhaiynR5AZNJ8Pp2VN8 wmjFRfaaV/LdcWqPQ8OHxhOgD0DgSaAFAlOeTnGr1oLmpF/pbc8ifCKwBm/pCt4kDnV2 qp5dtrkTsYnVCovTig1PhIoyhfv8wflkn2ird79tOGfbpqPCJ651ANmR4E18M3SUsepy R1C3c8LXIhD5+nEQne9m8fnTss31nlvB6wZ1z6f81jFqxU6kTThu138R9Gu6xXjch99v e/FzFpcC0Vulk5OX/E0UPIVCGEs7Xsur0vy83GwgMCSKeqit0CLdM8mU6ZY3idmfdNtH dDEQ== X-Gm-Message-State: AAQBX9fkkZRKEKvz37UaR0zK2RNgNfH+Hq9BYqc8wphDl4bM/68CMxts tP1jVT3oKf6v3wffYRWTt6zAC9Bpemc= X-Google-Smtp-Source: AKy350YBOIpk10tBtgTOlYyfWF9YP0BJzs2sRdhpvq8QlPLs3MfSYozpp4zid32VoibrS9RGlrvCIw== X-Received: by 2002:a6b:d908:0:b0:753:476f:9ff4 with SMTP id r8-20020a6bd908000000b00753476f9ff4mr1039444ioc.3.1681387073847; Thu, 13 Apr 2023 04:57:53 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id x16-20020a056638249000b004061d6abcd1sm401393jat.162.2023.04.13.04.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:53 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 05/12] doc: fix support for multiple docbook backends Date: Thu, 13 Apr 2023 05:57:38 -0600 Message-Id: <20230413115745.116063-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org docbook isn't a backend, but a famliy of backends. Signed-off-by: Felipe Contreras --- Documentation/asciidoc.conf | 12 ++++++------ t/t0600-doc-tools.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 303d45dc34..356b131870 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -22,15 +22,15 @@ apostrophe=' backtick=` litdd=-- -ifdef::backend-docbook[] +ifdef::basebackend-docbook[] [linkgit-inlinemacro] {0%{target}} {0#} {0#{target}{0}} {0#} -endif::backend-docbook[] +endif::basebackend-docbook[] -ifdef::backend-docbook[] +ifdef::basebackend-docbook[] ifdef::doctype-manpage[] # The following two small workarounds insert a simple paragraph after screen [listingblock] @@ -49,10 +49,10 @@ ifdef::doctype-manpage[] {title#} {title%} endif::doctype-manpage[] -endif::backend-docbook[] +endif::basebackend-docbook[] ifdef::doctype-manpage[] -ifdef::backend-docbook[] +ifdef::basebackend-docbook[] [header] template::[header-declarations] @@ -70,7 +70,7 @@ template::[docinfo] {manname} {manpurpose} -endif::backend-docbook[] +endif::basebackend-docbook[] endif::doctype-manpage[] ifdef::backend-xhtml11[] diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index e4388a54c6..2552b0d376 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -84,7 +84,7 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' -test_expect_failure ASCIIDOC 'legacy asciidoc.py (docbook5)' ' +test_expect_success ASCIIDOC 'legacy asciidoc.py (docbook5)' ' build_asciidoc_py "git-foo" docbook5 && check_manpage "git-foo" ' From patchwork Thu Apr 13 11:57:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210238 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5CF8C77B6E for ; Thu, 13 Apr 2023 11:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231281AbjDML6K (ORCPT ); Thu, 13 Apr 2023 07:58:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231134AbjDML6B (ORCPT ); Thu, 13 Apr 2023 07:58:01 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C57686B6 for ; Thu, 13 Apr 2023 04:57:56 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-7606df2b5e3so9913039f.3 for ; Thu, 13 Apr 2023 04:57:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387075; x=1683979075; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gprV56wg+2Xc/8OjOoEuNXsAn3pN8IUnKYbOuuG2fNQ=; b=U0gHc58D0huJnSAY4vfFfJ50duU5BarcFqrBNe3Gsy8y53d3OBI9dmncgVpUkwPAm0 5UcC2OycX7+iU0xGE/sIhWnPlbdrNShv/K9d6OGkzZKGcl4B3U6P/snG6SCynqVorQNH iTH+4g7W6jjRhUW61099XvIzGvZrN3xRIL8EIsrOhSV4pPSnkgl5G0gBvxNeT2RYHPfs ua14igCND0w0RvuGRe7JnOubfl6XnPZpwniRGi6XSO+a6fJtX5NGVMCC/9QLf+cfu9re ebPP6rnapF9EuYN5NbcLWAO9Ip4xX1oIRVRgKbUTnI+E8CzymKOGDsuuFdEby1Itqltr 6rRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387075; x=1683979075; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gprV56wg+2Xc/8OjOoEuNXsAn3pN8IUnKYbOuuG2fNQ=; b=CsMT6p/d3/G/9+M6J9VdSUvEfIZwofeu+VN2Hdfv9/St1ptymLfHiBknJ/TP8nfzEJ 6v4CVhUkH0AcyyQfKhU8ADLJlZsJNZojrzbRV8lj+BsIsfX+sKUF6N8CjDSZZOSYK3yQ QoqVl/e35ouRU3lcMoSk5TU5STm0dscskXKXQtwJfMs1h0reQkmifWPMOjhV3xpKMK08 4cS49HgeqFoMFViX0CpHENH62lZ8SVlvUrYmFOVqCuDgi9VWozt6KJDJB+Bv89bVwmeJ bG2Uzsw/SbGZozvj2sqrTMIUXJk5ss8VVfHqVzco7abhnDTGryw/tTauJklL3Z1Hf3Qm FWTA== X-Gm-Message-State: AAQBX9e0RlFW5xyS/c4MOdDq74X5A0cAFV8NuwiGKA60nqhhPFm1NX2l it5lWQO0UhKKNRvjjXvtZKzUv2KSveA= X-Google-Smtp-Source: AKy350ZhPYwBPNXMk3JKyUSYY4s19kwH8nnYHdV7/SqqVNxNdPD0tbfV/MxEGDuhdBGNISMjyqiFWw== X-Received: by 2002:a05:6e02:5c3:b0:32a:82e9:23c1 with SMTP id l3-20020a056e0205c300b0032a82e923c1mr471693ils.21.1681387075181; Thu, 13 Apr 2023 04:57:55 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id f5-20020a056638328500b00405f36ed05asm421710jav.55.2023.04.13.04.57.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:54 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 06/12] doc: add gen-stylesheet helper Date: Thu, 13 Apr 2023 05:57:39 -0600 Message-Id: <20230413115745.116063-7-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move most of the logic of xmlto into a simple script that generates a single stylesheet. There should be no functional changes. Signed-off-by: Felipe Contreras --- Documentation/.gitignore | 1 + Documentation/Makefile | 12 +++++------- Documentation/gen-stylesheet | 17 +++++++++++++++++ t/t0600-doc-tools.sh | 4 +++- 4 files changed, 26 insertions(+), 8 deletions(-) create mode 100755 Documentation/gen-stylesheet diff --git a/Documentation/.gitignore b/Documentation/.gitignore index a48448de32..afec7e7f19 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -15,3 +15,4 @@ tmp-doc-diff/ GIT-ASCIIDOCFLAGS /.build/ /GIT-EXCLUDED-PROGRAMS +/manpage.xsl diff --git a/Documentation/Makefile b/Documentation/Makefile index 3fab7ce9cd..96d3f52c60 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -155,7 +155,6 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) -MANPAGE_XSL = manpage-normal.xsl XMLTO = xmlto XMLTO_EXTRA = INSTALL ?= install @@ -176,10 +175,6 @@ endif -include ../config.mak.autogen -include ../config.mak -ifndef NO_MAN_BOLD_LITERAL -XMLTO_EXTRA += -m manpage-bold-literal.xsl -endif - # Newer DocBook stylesheet emits warning cruft in the output when # this is not set, and if set it shows an absolute link. Older # stylesheets simply ignore this parameter. @@ -338,8 +333,11 @@ $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< -manpage-prereqs := $(wildcard manpage*.xsl) -manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< +manpage-prereqs := manpage.xsl $(wildcard manpage*.xsl) +manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -x manpage.xsl $(XMLTO_EXTRA) man $< + +manpage.xsl: gen-stylesheet + ./gen-stylesheet >"$@" %.1 : %.xml $(manpage-prereqs) $(manpage-cmd) diff --git a/Documentation/gen-stylesheet b/Documentation/gen-stylesheet new file mode 100755 index 0000000000..c006a85c39 --- /dev/null +++ b/Documentation/gen-stylesheet @@ -0,0 +1,17 @@ +#!/bin/sh + +includes='manpage-normal.xsl' +test -z "$NO_MAN_BOLD_LITERAL" && includes="$includes manpage-bold-literal.xsl" + +cat < + + +EOF + +for x in $includes +do + printf '\n' "$x" +done + +echo "" diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index 2552b0d376..a003686c2f 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -54,10 +54,12 @@ description Part of the \fBgit\fR(1) suite EOF +"$doc_dir"/gen-stylesheet >"$doc_dir"/manpage.xsl + xmltoman() { base="$1" shift - xmlto --skip-validation -m "$doc_dir/manpage-normal.xsl" -m "$doc_dir/manpage-bold-literal.xsl" "$@" man "$base.xml" + xmlto --skip-validation -x "$doc_dir"/manpage.xsl man "$base.xml" } build_asciidoc_py() { From patchwork Thu Apr 13 11:57:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D0D3C77B61 for ; Thu, 13 Apr 2023 11:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231299AbjDML6M (ORCPT ); Thu, 13 Apr 2023 07:58:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231185AbjDML6C (ORCPT ); Thu, 13 Apr 2023 07:58:02 -0400 Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A09A7A5CA for ; Thu, 13 Apr 2023 04:57:57 -0700 (PDT) Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-183f4efa98aso23612931fac.2 for ; Thu, 13 Apr 2023 04:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387076; x=1683979076; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TXYPzqdVsRWbI3oRWnuN8D8jacrKJeOkaBJFBo6eV20=; b=Y5wC4x1VanLUzoymK7jnqVBgU/ATCEHooZ/P6yBuaB9qH7fWrp0qbEMP86ODaWicRJ TtQaUQ2opu2g6xK9x+9oKTXfJOzpn7+V4to4yKW1qQ9xx+QPUwDyKtbgxfMgTga+Ffuf BXG0aZKb4p8EFF6uXkMQ+Xca0nRTeOpAsxysjhPeeF6tBOQSpZcRA15D8zrOX893u9gi ZMbsCJuwKCpmiaRfaQX/v0A32UU4s9EE9nvAcFTtjnuOLoPaG7CHIqcmXCQJ8Wmvag0V e9RI9DTYVyvYrkl4GpgWrEWqqqUzbKvgRUmnND45k1dEfmLMetMlmMiujuPy2yVTdGER GQGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387076; x=1683979076; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TXYPzqdVsRWbI3oRWnuN8D8jacrKJeOkaBJFBo6eV20=; b=VJl9kIM6QPZcJtrQCKpsq8oKiGmYL9UBNgihg+5+r8C08+p0sDM8Lpk3HXek3cnu+d v5ro0/aGu9nRf4y5bDEgZDEKnLidh/qWc1LJ7Fpea8N7PXETyfBV8FPBiBAkXAmzKXoP cxxLIF7o04Nu/IxocI/9Mb2l1V7WweTyQZ90E6ZqU7v9KyIIN/RgruhAZcP1VZ3uPv5W d7Dtuks0KaXsF4UQUiAFqwPq3jUIVUuijxx8Gd5n9VFi8dt9yNLZRJ6gVK1hnJ7/Lz1T MfEjTBl8nx+j69pDliDcNmIi/kzD1U6QACKL0FbXtKc/HcV5M079bO6Iu69I8Xk6sPMG MB7A== X-Gm-Message-State: AAQBX9fVHJeKOnyBRpmv1ZyQjjFLk30U/EG7a/1GxJfw3gJYHa3evv8f oLWc4bPLDwhSTap+x5To3DR62QYcWPk= X-Google-Smtp-Source: AKy350ZfI51de/otlWJJ/DQz6G4oHAkBdJNJ6wYvR7f3PnCeD9jx6tk6XSj8Sbcgb+lvbYmo5Cd19w== X-Received: by 2002:a05:6870:2196:b0:177:81bb:1b1b with SMTP id l22-20020a056870219600b0017781bb1b1bmr1473756oae.40.1681387076543; Thu, 13 Apr 2023 04:57:56 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id n3-20020a056870034300b0017f84f81f3csm597062oaf.52.2023.04.13.04.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:56 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 07/12] doc: get rid of xmlto dependency Date: Thu, 13 Apr 2023 05:57:40 -0600 Message-Id: <20230413115745.116063-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We don't use any of its functionality, so all it's doing for us is generate a stylesheet, which we are doing by ourselves now. Use `xsltproc` directly. This gets rid of some annoying warnings because my system doesn't use debian's libpaper: (null): unknown option '-n' (null): unknown option '-mh' (null): unknown option '-mw' Signed-off-by: Felipe Contreras --- Documentation/Makefile | 6 ++---- t/t0600-doc-tools.sh | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 96d3f52c60..3e2cbef306 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -155,7 +155,6 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) -XMLTO = xmlto XMLTO_EXTRA = INSTALL ?= install RM ?= rm -f @@ -184,7 +183,7 @@ endif ifndef MAN_BASE_URL MAN_BASE_URL = file://$(htmldir)/ endif -XMLTO_EXTRA += --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)' +XMLTO_EXTRA += --stringparam man.base.url.for.relative.links '$(MAN_BASE_URL)' ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor @@ -196,7 +195,6 @@ ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = -XMLTO_EXTRA += --skip-validation endif SHELL_PATH ?= $(SHELL) @@ -334,7 +332,7 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-prereqs := manpage.xsl $(wildcard manpage*.xsl) -manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -x manpage.xsl $(XMLTO_EXTRA) man $< +manpage-cmd = $(QUIET_XMLTO)xsltproc --nonet $(XMLTO_EXTRA) -o $@ manpage.xsl $< manpage.xsl: gen-stylesheet ./gen-stylesheet >"$@" diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index a003686c2f..0af431941d 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -57,9 +57,7 @@ EOF "$doc_dir"/gen-stylesheet >"$doc_dir"/manpage.xsl xmltoman() { - base="$1" - shift - xmlto --skip-validation -x "$doc_dir"/manpage.xsl man "$base.xml" + xsltproc --nonet -o "$1.1" "$doc_dir/manpage.xsl" "$1.xml" } build_asciidoc_py() { From patchwork Thu Apr 13 11:57:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210240 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 789BAC77B6F for ; Thu, 13 Apr 2023 11:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231185AbjDML6N (ORCPT ); Thu, 13 Apr 2023 07:58:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230408AbjDML6C (ORCPT ); Thu, 13 Apr 2023 07:58:02 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B12E419B for ; Thu, 13 Apr 2023 04:57:58 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id bx42so26155397oib.6 for ; Thu, 13 Apr 2023 04:57:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387077; x=1683979077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iG05m1s5ONOnlMKFDVhfBZ1jYfEbz+GcmYbgSyKXBtw=; b=NcH85y4WgyUnVlzwRAXofG++Lu9OmLeeNdyK5ErrsWJBn8IRkODkiDtjHLrEm44JV7 p19Tl4UwU5u3NTrfZkA1rCYTxupB6JhvXe+0zejHBTdH8CVNp3B3hi9wMmW/FsAi4Ek9 vwWX0tXYPJjOVoNWfZ0nZUGFfLia2f0dkW0S5Yk36tN0GEbSKfi7EaL+mJ1GmUfLv9Bh 1Qa67gKQAjRe2osD9ieGM7TyATup+D7vGSH6y1EULb2z1h+iiXvgVpVYU6Z7gqRDjL7p sfqBaRv0DRD8ssQUE3Wza5S3bcjyhwpg/OBE5SRGUGxT/gkQ0p06QSmh9gaRTIe32qvI fDqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387077; x=1683979077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iG05m1s5ONOnlMKFDVhfBZ1jYfEbz+GcmYbgSyKXBtw=; b=eGkKercC9XHMJIgUdjBR+vmv+N8OSOyIstHwvp++WRAkyaz4NfJG5KCfbcfRpOJJ12 yDDO/OG9xcr+tu8KSKadKTFD2RRZeY78qx6mkss1pll7pfqKK0gk/eFlRJBL5AJnr3DB Wy7i6j4gUsH4m/c0eFG0b29iuzjzSrIfJdcn/ZVbUXV1VvyTmAET9yeJd9U92f2pbtah Aqy4YCMrH/IHoMSI5SsQ+DCdYcNc3wjnz1Bw84gAtYMxFlsylmH66pYDC4gauf2cfYdu MqFgREjjxBD+vaAHJkVm9Du563VcsLa8Z7mSr35OraEDj8C4WlScf+LrnVLs/0I+auHP qEoA== X-Gm-Message-State: AAQBX9ebNmzo/KxzrL0LnAjlbrZUA4NzEryMbNR8sEzSil46P61CPga+ 5jMqaCn3ePL3EY0pVcrVHVu5xJkg5BU= X-Google-Smtp-Source: AKy350Z9H60RGwAT6VcjIPQ1kGUazutsjJD/xYwbfPq6Yb6bMYeIlyMaZLGrrNZP8qcsueyM730GBA== X-Received: by 2002:aca:1709:0:b0:387:38f:9cf0 with SMTP id j9-20020aca1709000000b00387038f9cf0mr996638oii.33.1681387077785; Thu, 13 Apr 2023 04:57:57 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id bi9-20020a056808188900b00387160bcd46sm527770oib.46.2023.04.13.04.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:57 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 08/12] test: doc: use temporary stylesheet Date: Thu, 13 Apr 2023 05:57:41 -0600 Message-Id: <20230413115745.116063-9-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org xsltproc doesn't have a problem with a our trash directory. Signed-off-by: Felipe Contreras --- t/t0600-doc-tools.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index 0af431941d..cd88027514 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -54,10 +54,10 @@ description Part of the \fBgit\fR(1) suite EOF -"$doc_dir"/gen-stylesheet >"$doc_dir"/manpage.xsl +"$doc_dir"/gen-stylesheet >manpage.xsl xmltoman() { - xsltproc --nonet -o "$1.1" "$doc_dir/manpage.xsl" "$1.xml" + xsltproc --nonet -o "$1.1" manpage.xsl "$1.xml" } build_asciidoc_py() { From patchwork Thu Apr 13 11:57:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7958C77B6E for ; Thu, 13 Apr 2023 11:58:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231364AbjDML6V (ORCPT ); Thu, 13 Apr 2023 07:58:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbjDML6D (ORCPT ); Thu, 13 Apr 2023 07:58:03 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C1D0A275 for ; Thu, 13 Apr 2023 04:58:00 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id cg19-20020a056830631300b0069f922cd5ceso6957302otb.12 for ; Thu, 13 Apr 2023 04:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387079; x=1683979079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X5hWuYiGKmRVn+GABFhx7MPl0aHsZWEx0YXjqctiLAo=; b=JMzpKrLIiL4p28lWMbpoHsP33dkUaZJ2rKLelY8yE0s5SFdMnMhm43mBGLdG/RiWkH OiVhnTKCgmsa2qA/qGv3rwaN6rEDMoptKfCb3a3/Kp+yT1umQP+0XzXC4RmVmo/E5gN0 V/2c5GMnJGSVtX0VI0siWfZ+H8CZNgRHBxyUmcLXj2Jz0vMUMae52duRDuIYtFqzuHEL ZW0mw+YBEiRT6mdK5J5apZpe7wTPI1KxHCFjd6kSHErO0Q4RTRpimiNfrnx5Se4SYXtx jtngnyE2BzupA3bYjv9nWDs8KPXQ6eG/1tBFDseyn1NKuZ6hOh71YhsAYvcwQI0dHwHG QGIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387079; x=1683979079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X5hWuYiGKmRVn+GABFhx7MPl0aHsZWEx0YXjqctiLAo=; b=XQXLuhCaMc0Ag02HIXOmRMg2jQrUBZ8niJ3XT4UheSR3YpYDMlBbX85FNRH75+Zi8T 82GwkDOUF6701y8jLoS7fCAmVYCMAGH0sI4x/EbAlt5mzxjHqT1wixuN1GGQ8mxx7Hu5 YK++tWVRzk0ricXVZbbZVOx03l+vBfUHxg2NUlZDVE1izZUuN895sbymjNSH9AdWojMi Y7x64mvxbsB6jN1Caalo5aptPTeGSCN5kCHQsbYLQakZkTebLmPp/FoEJl/vzI0x7Ov0 vmHNXJAd3hn7GbTJmXXyZLbIjkoc+NsujW8JtsI6nCPtvCQCmaKdQ4sAjYRnxfGXoLjP ZPWA== X-Gm-Message-State: AAQBX9e+5zIltWYUKU9anvv7N9w97uq30gsCwbFb6EsHD3mowT6IKTZO 5Br2pAI5t6y3f2SjlGZ/71QascopEMg= X-Google-Smtp-Source: AKy350b0H/swOYdbil6Rn4ZWsBInutp9N+8hK+HtYjvP7hcxpxmT3B0U4bm3JljDW+IVvYH1E70B8A== X-Received: by 2002:a9d:730d:0:b0:6a4:2d0e:d9dc with SMTP id e13-20020a9d730d000000b006a42d0ed9dcmr852417otk.20.1681387079117; Thu, 13 Apr 2023 04:57:59 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id v16-20020a05683011d000b0069457b86060sm610185otq.47.2023.04.13.04.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:58 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 09/12] doc: remove references to xmlto Date: Thu, 13 Apr 2023 05:57:42 -0600 Message-Id: <20230413115745.116063-10-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- Documentation/Makefile | 6 +++--- Documentation/manpage-normal.xsl | 2 +- INSTALL | 4 ++-- ci/install-dependencies.sh | 2 +- shared.mak | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 3e2cbef306..a85f60f766 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -155,7 +155,7 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) -XMLTO_EXTRA = +XSLTPROC_EXTRA = INSTALL ?= install RM ?= rm -f MAN_REPO = ../../git-manpages @@ -183,7 +183,7 @@ endif ifndef MAN_BASE_URL MAN_BASE_URL = file://$(htmldir)/ endif -XMLTO_EXTRA += --stringparam man.base.url.for.relative.links '$(MAN_BASE_URL)' +XSLTPROC_EXTRA += --stringparam man.base.url.for.relative.links '$(MAN_BASE_URL)' ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor @@ -332,7 +332,7 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-prereqs := manpage.xsl $(wildcard manpage*.xsl) -manpage-cmd = $(QUIET_XMLTO)xsltproc --nonet $(XMLTO_EXTRA) -o $@ manpage.xsl $< +manpage-cmd = $(QUIET_XSLTPROC)xsltproc --nonet $(XSLTPROC_EXTRA) -o $@ manpage.xsl $< manpage.xsl: gen-stylesheet ./gen-stylesheet >"$@" diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl index a9c7ec69f4..3fb044a8a7 100644 --- a/Documentation/manpage-normal.xsl +++ b/Documentation/manpage-normal.xsl @@ -4,7 +4,7 @@ version="1.0"> - + diff --git a/INSTALL b/INSTALL index 4b42288882..48c126b3be 100644 --- a/INSTALL +++ b/INSTALL @@ -176,13 +176,13 @@ Issues of note: the name is reserved for local settings. - To build and install documentation suite, you need to have - the asciidoc/xmlto toolchain. Because not many people are + the asciidoc/xsltproc toolchain. Because not many people are inclined to install the tools, the default build target ("make all") does _not_ build them. "make doc" builds documentation in man and html formats; there are also "make man", "make html" and "make info". Note that "make html" - requires asciidoc, but not xmlto. "make man" (and thus make doc) + requires asciidoc, but not xsltproc. "make man" (and thus make doc) requires both. "make install-doc" installs documentation in man format only; there diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 4f407530d3..fe72525f1f 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -69,7 +69,7 @@ sparse) ;; Documentation) sudo apt-get -q update - sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make + sudo apt-get -q -y install asciidoc xsltproc docbook-xsl-ns make test -n "$ALREADY_HAVE_ASCIIDOCTOR" || sudo gem install --version 1.5.8 asciidoctor diff --git a/shared.mak b/shared.mak index aeb80fc4d5..52fbc8ec6f 100644 --- a/shared.mak +++ b/shared.mak @@ -78,11 +78,10 @@ ifndef V ## Used in "Documentation/Makefile" QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@; - QUIET_XMLTO = @echo ' ' XMLTO $@; + QUIET_XSLTPROC = @echo ' ' XSLTPROC $@; QUIET_DB2TEXI = @echo ' ' DB2TEXI $@; QUIET_MAKEINFO = @echo ' ' MAKEINFO $@; QUIET_DBLATEX = @echo ' ' DBLATEX $@; - QUIET_XSLTPROC = @echo ' ' XSLTPROC $@; QUIET_GEN = @echo ' ' GEN $@; QUIET_STDERR = 2> /dev/null From patchwork Thu Apr 13 11:57:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38750C77B61 for ; Thu, 13 Apr 2023 11:58:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231390AbjDML6Y (ORCPT ); Thu, 13 Apr 2023 07:58:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231232AbjDML6J (ORCPT ); Thu, 13 Apr 2023 07:58:09 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1EC59773 for ; Thu, 13 Apr 2023 04:58:01 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id cg19-20020a056830631300b0069f922cd5ceso6957326otb.12 for ; Thu, 13 Apr 2023 04:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387080; x=1683979080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZzQKhI3rPEaaHLtlp6EiEJpW9xfOn0SqJKvOAN7iXkI=; b=SEWKiWrr4ZCRFfvdQnk5fp2MFhCbUNpjy/YNKbizdt8rG9APL+qrK4ejcIpeMNpIjc 9eIa008FQeCjcmrXv1ibJ0goDqTMo1fE5DQEXBE+IiHkGdU7Cvzkf1UhHpWEE9MOToRh 2Oo6tYyz+DiOI9xzR0kxvI5BRiFJXdSKiiVxFhZ94jraTBzDLB8KxrI5+xn3kpAJyzHX mmRjejCli2nlGdfPAKninK6MOVFMA4fKd8O0quUlZJ9+3Ore8CYHdy3482frfujNx7sM y51C29WE8+zfteZqmD9p/ZUEbJyEdEXIuXDUWyIIzU/5M4Qm1LDk0M44wH3WlhuPVyc8 Eh5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387080; x=1683979080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZzQKhI3rPEaaHLtlp6EiEJpW9xfOn0SqJKvOAN7iXkI=; b=cBnR1SHX67dfsVUlH3A9cHNxQzbiVUKy5tcKw8FamFsFuaB25Bq+Rnjv/0kQXOMWGA Y+vOeWhYu/XrQhWUp4KrjKMo/LI+aK6Ri/GnXOJFoXRj0SAZyim9Kq7belccGNlSmOCM CF8GlGuIZLiihQM1roDyU1jnKh9IqwBiT47Klzft7kOBP2IZ+wsGK9rfRdhpk5ikgD9/ Cl8PEaWSfbc1tyiMJeNiE/BiDXqtA+m4CS0g0avtCEbCXeKaRvLSpWhbpLItR6Yoh9l8 O2OJ3cjwoFyUefh2rDCVCC2UQQN988pW8c29ibhgUElrweNLFovoHQmcAvmsLxEBYrZJ WufQ== X-Gm-Message-State: AAQBX9eUOI8hjiCeT2FHX/vWkVoUyzNgmE914OU/lu6XhGRbOZ5jaJ+r eepgkvRwqXBbZnmdbZzYckbGij9Xg4U= X-Google-Smtp-Source: AKy350absN1HhFvY2sbGet6EZH9Xh/hQF9E53Pwt+XaX4al98WEUWpQgAU0Ykw2MRuZq9k2oUO87FA== X-Received: by 2002:a9d:6f05:0:b0:6a4:28e5:8a8d with SMTP id n5-20020a9d6f05000000b006a428e58a8dmr926194otq.10.1681387080383; Thu, 13 Apr 2023 04:58:00 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id c7-20020a9d6847000000b0069f0794861asm582525oto.63.2023.04.13.04.57.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:57:59 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 10/12] doc: stylesheet: move all the xslt templates Date: Thu, 13 Apr 2023 05:57:43 -0600 Message-Id: <20230413115745.116063-11-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's no need to have them scattered everywhere. Signed-off-by: Felipe Contreras --- Documentation/gen-stylesheet | 42 +++++++++++++++++++++----- Documentation/manpage-bold-literal.xsl | 16 ---------- Documentation/manpage-normal.xsl | 26 ---------------- 3 files changed, 35 insertions(+), 49 deletions(-) delete mode 100644 Documentation/manpage-bold-literal.xsl delete mode 100644 Documentation/manpage-normal.xsl diff --git a/Documentation/gen-stylesheet b/Documentation/gen-stylesheet index c006a85c39..7d1839fcab 100755 --- a/Documentation/gen-stylesheet +++ b/Documentation/gen-stylesheet @@ -1,17 +1,45 @@ #!/bin/sh -includes='manpage-normal.xsl' -test -z "$NO_MAN_BOLD_LITERAL" && includes="$includes manpage-bold-literal.xsl" - cat < EOF -for x in $includes -do - printf '\n' "$x" -done +# these params silence some output from xsltproc +cat < + +EOF + +# convert asciidoc callouts to man page format +cat < + + + + .sp + + + + + + + .br + +EOF + +if [[ -z "$NO_MAN_BOLD_LITERAL" ]] +then + # render literal text as bold (instead of plain or monospace); this makes + # literal text easier to distinguish in manpages viewed on a tty + cat <<-EOF + + \fB + + \fR + + EOF +fi echo "" diff --git a/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl deleted file mode 100644 index e13db85693..0000000000 --- a/Documentation/manpage-bold-literal.xsl +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \fB - - \fR - - - diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl deleted file mode 100644 index 3fb044a8a7..0000000000 --- a/Documentation/manpage-normal.xsl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - .sp - - - - - - - .br - - - From patchwork Thu Apr 13 11:57:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D13C7C77B6F for ; Thu, 13 Apr 2023 11:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229618AbjDML6Z (ORCPT ); Thu, 13 Apr 2023 07:58:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231235AbjDML6J (ORCPT ); Thu, 13 Apr 2023 07:58:09 -0400 Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3BF09ED9 for ; Thu, 13 Apr 2023 04:58:02 -0700 (PDT) Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-187878a90e6so3527399fac.0 for ; Thu, 13 Apr 2023 04:58:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387081; x=1683979081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T65ucdKm+tRgnG4pL9NczmK9GKxC4f5iCXDxKYvxP1Y=; b=PILO6tzkfAwcuBeqKcaWIPacTdo7SFnuMT9AHZqWK+VAvCLKVInxwXALbyV2j7ApRq WLSxT9g76geEjWDfwmccBQbIjUX4zy4NFdj+miQsz7lpyvylyTH0A1qdN1G493JnyQ8f RSevGJgE2q6TjHTE/CKkZPNtz5wjvWeBZRW2ICuFF2VNW+F7RQYiadHVvzVj0i9bt/XW sv1RFMLeyAEQITLdJKGD1sSrCjtLK43ARIwXNqY/PL7A57LrAl6xIUyWnz6Gc64q+qPC HOKxZWGtDyYfX8YL2f6DeavknNLSFUadirvm692qtS5usZhNnODpzJt1p0SzoVz4rNMF PFXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387081; x=1683979081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T65ucdKm+tRgnG4pL9NczmK9GKxC4f5iCXDxKYvxP1Y=; b=BS9Vt15KtnqN1Wr0876x6tM0yD+5uFG9oy+ICbr3MH044eXbB3MItXhS/ozAufyuaX 5USsJXpCwcC/S9VPY7heNwshPUcQ7oouAbSWTeX5r0DCfT3y9ftuL4If35TriTp3phGf 0IZ6Xija9rHdr39I36WPC97AJW0x0YG7ATYZftJlkJ2GIOm0hJGc8dMVxsCZwxk1OVpB Pfpk+wD2V95Hs+GVISUcZWSYHPITt+1vwMdjjYspOH1AA7dqcKviNkwWsI4TNaB3JQaK tj7/81jkQOtHKjX+yVYnt7a03Oo2GxvSHDMmeXOuvcCsig/N2QFU8FzlD7opfi9hUdTg Qxiw== X-Gm-Message-State: AAQBX9epucgxTDCN0pie25Sm+Ot5bu+921jlkLDDkB1rXTjQbqDCmjCY 72cf80BYHaszNS8T2uHfk1N9pcvClkg= X-Google-Smtp-Source: AKy350ajMvc3iQqRVGt6XfzU453Zeq+uzc7v+/oyVbOiEZFLDod49+fowKNRlMVxctDvT5Od2afqtg== X-Received: by 2002:a05:6870:8286:b0:17e:13e9:1e4a with SMTP id q6-20020a056870828600b0017e13e91e4amr1591545oae.17.1681387081709; Thu, 13 Apr 2023 04:58:01 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id eb8-20020a056870a88800b001777244e3f9sm622728oab.8.2023.04.13.04.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:58:01 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 11/12] test: doc: add check for callouts Date: Thu, 13 Apr 2023 05:57:44 -0600 Message-Id: <20230413115745.116063-12-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- t/t0600-doc-tools.sh | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index cd88027514..545fb0e199 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -26,6 +26,17 @@ DESCRIPTION ----------- description +CALLOUTS +-------- +---- +$ git diff <1> +$ git diff --cached <2> +$ git diff @ <3> +---- +<1> Callout 1 +<2> Callout 2 +<3> Callout 3 + GIT --- Part of the linkgit:git[1] suite @@ -49,6 +60,27 @@ git-foo \- Test command .SH "DESCRIPTION" .sp description +.SH "CALLOUTS" +.sp +.if n \{\\ +.RS 4 +.\} +.nf +$ git diff \fB(1)\fR +$ git diff \-\-cached \fB(2)\fR +$ git diff @ \fB(3)\fR +.fi +.if n \{\\ +.RE +.\} +.sp +.sp +\fB1. \fRCallout 1 +.br +\fB2. \fRCallout 2 +.br +\fB3. \fRCallout 3 +.br .SH "GIT" .sp Part of the \fBgit\fR(1) suite @@ -84,12 +116,12 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' -test_expect_success ASCIIDOC 'legacy asciidoc.py (docbook5)' ' +test_expect_failure ASCIIDOC 'legacy asciidoc.py (docbook5)' ' build_asciidoc_py "git-foo" docbook5 && check_manpage "git-foo" ' -test_expect_success ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' +test_expect_failure ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' build_asciidoctor "git-foo" && check_manpage "git-foo" ' From patchwork Thu Apr 13 11:57:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13210244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 793D3C77B61 for ; Thu, 13 Apr 2023 11:58:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230316AbjDML61 (ORCPT ); Thu, 13 Apr 2023 07:58:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231171AbjDML6K (ORCPT ); Thu, 13 Apr 2023 07:58:10 -0400 Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28F59A5DE for ; Thu, 13 Apr 2023 04:58:04 -0700 (PDT) Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1879edfeff5so261450fac.4 for ; Thu, 13 Apr 2023 04:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681387083; x=1683979083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I4AoSz0sDnGJpdaZEXLG3ByVrqWl4nmgwL0lAcEIhUc=; b=hJpwebgJQ4Lz+FFds5NFKkYcBOwkjn1OGNQxOydMg29ZscEvlsu5ld4aLGXON8cwYJ j1dlVjitF6JeWCMhlKoHxUI3CBjwK9x99oBQS0b4DIZijqeS3dAhPuZjPWSh0oBSf+K8 GioOkKoz3fRi0QBUM7a3PtLeA9OFM+z4NnhI9GsnKUCb8E07nqY/RcjCNkeqgLVqBcBK b69MLSrCnK9xZHxO+0lVH9tSpW3JjQuN8c6ZbeqNr7X9Bz+OMelbgUNLg4DtSFa01oqR up4rrZRekjWYkGMkPfZEiCrU1YQNrc2N+CG5fiOArbVBtVea43vqIT0/GNSvM8lVN8i4 U7TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681387083; x=1683979083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I4AoSz0sDnGJpdaZEXLG3ByVrqWl4nmgwL0lAcEIhUc=; b=OzrcflaJJauUe0MEpn9bHIvKGxA5OuqG2eayxu/gwkVLu7HPB83AG3PImkYoRP9stV a9rlM4AKQib4S1Y47Pd7rotr323vjCkRSEAnSend/C1E7zcD5JlW+IDCfGp0LhSP2kCX +Oqtb+PP3H6/3VO1Yg550AqnkfC5SZ7TtCjSOLMIjqoM3Hw1dWZ3jZEo64qlyl2Imp39 wN0qh6tjs60rjitrd8f+QIRagEG1s7ZS8XMD+5v5YPeJbgFTTz1VroaQT7tEhzZPqZpS aHcNQcfaFozW1kRmntS4bJFdVzOmZaLNaLAI2JjkCiWWxZ0fLfhh0zdm4BckI6yoTkGO xeCQ== X-Gm-Message-State: AAQBX9fjrfYXoiCJ7Vpkw0Beb/C77+goxwW/FWXz3ifbRsfG3q7+WA/t YbkocLLwkNXl+OqgBfh3sOAhn/6vd+4= X-Google-Smtp-Source: AKy350aAlcLT9/GSjUFd+QZJ82asDOn6gMWc9fg+SjIQSZusep8OatQznp7WflXw7aWOkfJVQoVzfA== X-Received: by 2002:a05:6870:968d:b0:17a:b663:d440 with SMTP id o13-20020a056870968d00b0017ab663d440mr1469239oaq.42.1681387082971; Thu, 13 Apr 2023 04:58:02 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id dw19-20020a056870771300b001729072f759sm649197oab.0.2023.04.13.04.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 04:58:02 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , Chris Johnsen , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Jeff King , Felipe Contreras Subject: [RFC PATCH 12/12] doc: manpage: remove callout hack Date: Thu, 13 Apr 2023 05:57:45 -0600 Message-Id: <20230413115745.116063-13-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.40.0+fc1 In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com> References: <20230413115745.116063-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org DocBook Stylesheets already have much better support for callouts. This: $ git diff (1) $ git diff --cached (2) $ git diff HEAD (3) 1. Changes in the working tree not yet staged for the next commit. 2. Changes between the index and your last commit; what you would be committing if you run git commit without -a option. 3. Changes in the working tree since your last commit; what you would be committing if you run git commit -a Looks much better than this: $ git diff (1) $ git diff --cached (2) $ git diff HEAD (3) 1. Changes in the working tree not yet staged for the next commit. 2. Changes between the index and your last commit; what you would be committing if you run git commit without -a option. 3. Changes in the working tree since your last commit; what you would be committing if you run git commit -a This implementation goes back to 2006: 776e994af5 (Properly render asciidoc "callouts" in git man pages., 2006-04-28). It probably wasn't needed since a long time ago. Signed-off-by: Felipe Contreras --- Documentation/gen-stylesheet | 17 ----------------- t/t0600-doc-tools.sh | 24 +++++++++++++++--------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/Documentation/gen-stylesheet b/Documentation/gen-stylesheet index 7d1839fcab..53c3dfca17 100755 --- a/Documentation/gen-stylesheet +++ b/Documentation/gen-stylesheet @@ -12,23 +12,6 @@ cat < EOF -# convert asciidoc callouts to man page format -cat < - - - - .sp - - - - - - - .br - -EOF - if [[ -z "$NO_MAN_BOLD_LITERAL" ]] then # render literal text as bold (instead of plain or monospace); this makes diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh index 545fb0e199..10a472e1e6 100755 --- a/t/t0600-doc-tools.sh +++ b/t/t0600-doc-tools.sh @@ -74,13 +74,19 @@ $ git diff @ \fB(3)\fR .RE .\} .sp -.sp -\fB1. \fRCallout 1 -.br -\fB2. \fRCallout 2 -.br -\fB3. \fRCallout 3 -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Callout 1 +T} +\fB2.\fR\h'-2n':T{ +Callout 2 +T} +\fB3.\fR\h'-2n':T{ +Callout 3 +T} +.TE .SH "GIT" .sp Part of the \fBgit\fR(1) suite @@ -116,12 +122,12 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' ' check_manpage "git-foo" ' -test_expect_failure ASCIIDOC 'legacy asciidoc.py (docbook5)' ' +test_expect_success ASCIIDOC 'legacy asciidoc.py (docbook5)' ' build_asciidoc_py "git-foo" docbook5 && check_manpage "git-foo" ' -test_expect_failure ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' +test_expect_success ASCIIDOCTOR 'modern asciidoctor (docbook5)' ' build_asciidoctor "git-foo" && check_manpage "git-foo" '