From patchwork Mon Mar 11 09:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 10846999 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B219139A for ; Mon, 11 Mar 2019 09:26:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8B5A28E29 for ; Mon, 11 Mar 2019 09:26:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC37228EC6; Mon, 11 Mar 2019 09:26:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 841EA28E29 for ; Mon, 11 Mar 2019 09:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727110AbfCKJ0J (ORCPT ); Mon, 11 Mar 2019 05:26:09 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:33013 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727017AbfCKJ0J (ORCPT ); Mon, 11 Mar 2019 05:26:09 -0400 Received: by mail-wm1-f66.google.com with SMTP id c13so13447625wmb.0 for ; Mon, 11 Mar 2019 02:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v/g2/Vfyeed/N1mnUE5TzGuRK5sB67STSierLZVFlSE=; b=stmT/XYXZri66nHYwjXYlWDyixzpdd31YX1dUczdjjJypJrFto2XzXjmFAMp1DBjLU nd7Qg258END+sstOAcFzJXQhjZRoD2LRngqtGywxTuhGw+d7Jox3k4QdKefJY1uwswsl wvDRCIO9I9HLgnBFgnobfMatynt0xUsmQ0qXA4DUlQyIUmY9ozwMR0F7ezC1jc7kXjW8 OmNliEUtLPlAbOYyXef1Hv6y/RCkoAb+zcAsQOpDEsOxnnp21Le4j4MSeJPmho5mT+iJ jne8c0cY9UPAuemkUQ2RCrq2uUwbIV7FNXb9GXGz+o5r5LumFqqnF9JT1g+eT9LMsnYC 6iPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=v/g2/Vfyeed/N1mnUE5TzGuRK5sB67STSierLZVFlSE=; b=sNN6Obko5d20wM9T+mounM3lQfnYzznSmI+jIJCA/9Y8xa1kcTba7041aDPgJFtMmS BgtZVGzJdbpMGReZ5ZPhiLwPn/cb4F51OS56/gcI8StsSL2ioSIMuKVs6HsIw8lY9uVt VYVi41D7WujdzUswg8r73nERBRJWwQpZ9VKkfoloOJ9pzk4aH7Vy691RSK/2bLVr/ssG V/4dPFZPrEslOgdjQjdpIiyMLQoJt+92ybcIwQUqus+vWHZlmaMoF+neJqlx4zSM0BJw Pg1LtIJZguj6cb2yj77R1IpV6Iv/6XsRZqFjH8o/n7qYfidyFbzsh28S8x2+ofY8JfDl //rw== X-Gm-Message-State: APjAAAWKmtYEfF9YpjEqH/zzsMFjDmlbE+2V7N8i57MWXhBfUfybjaM/ RJ3lbXIDjowSwwVgSKUsRjVTaMqZkL4= X-Google-Smtp-Source: APXvYqxLKMAGqi8CwduK0LbWU/6W7WjEqOGSScOtKjOc/nBx9OyWsLSRzDdHAl2KqIwxLUE/KW8VZQ== X-Received: by 2002:a1c:23c4:: with SMTP id j187mr16026658wmj.13.1552296366072; Mon, 11 Mar 2019 02:26:06 -0700 (PDT) Received: from localhost (141.255.76.34.bc.googleusercontent.com. [34.76.255.141]) by smtp.gmail.com with ESMTPSA id q10sm4629856wrr.75.2019.03.11.02.26.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2019 02:26:05 -0700 (PDT) From: Junio C Hamano To: git@vger.kernel.org Cc: =?utf-8?q?Martin_=C3=85gren?= Subject: [PATCH v3 1/3] Documentation/Makefile: add missing xsl dependencies for manpages Date: Mon, 11 Mar 2019 18:26:03 +0900 Message-Id: <20190311092605.259322-1-gitster@pobox.com> X-Mailer: git-send-email 2.21.0-155-ge902e9bcae In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Martin Ågren These stylesheets very rarely change, but when they do, it really helps if the manpages depend on them. We're casting the net a bit too wide here, since we'll only ever use a subset of the stylesheets, but since these files change so rarely, that should be ok. It's better than missing a dependency. Observe that manpage-base-url.xsl is a generated file, so we need to list it explicitly, besides the `wildcard` expression we're adding here. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index d5d936e6a7..ea6b8e5d72 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -347,7 +347,7 @@ $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ -%.1 %.5 %.7 : %.xml manpage-base-url.xsl +%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) $(QUIET_XMLTO)$(RM) $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< From patchwork Mon Mar 11 09:26:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 10847001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31CCF1823 for ; Mon, 11 Mar 2019 09:26:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D0D128E29 for ; Mon, 11 Mar 2019 09:26:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 114C128E88; Mon, 11 Mar 2019 09:26:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A479928E5F for ; Mon, 11 Mar 2019 09:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727116AbfCKJ0J (ORCPT ); Mon, 11 Mar 2019 05:26:09 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54925 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727026AbfCKJ0J (ORCPT ); Mon, 11 Mar 2019 05:26:09 -0400 Received: by mail-wm1-f66.google.com with SMTP id f3so3608718wmj.4 for ; Mon, 11 Mar 2019 02:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UN1Chqz62Odjby61Uqy3M12OU4QqX7aXz3a4gP6nVqI=; b=gRf1bCV7fjfSzspcWfQsyKvXMOzgHol1JVZONh/tZPb/YlMFnHZ9o5eH8lt1vT1Dmh fejt2C89eEjEewq821MThfc90qzHikezWPtEUo3WNsS+lYDehx5Y9e8MI2t6lqQOqNHB uMdApLQ66n23ZvBez7y+6ZvxOtkMcRQVIenTDpuTwKqy48KxVOmaooc+iJxIDKtBnsMu pHl/9ECU36oKMglNUF/lrabbpAIFjfQmPQGDhJ6DZcXOD+zvkLlXozI54E2iH2kQaQU+ zIEJD6c5U/OsM+qq7z8thbyGPNKFJDkPLCoeteRo1L05ed2xuseNzsdneRxsIAvH2Z8k mJ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UN1Chqz62Odjby61Uqy3M12OU4QqX7aXz3a4gP6nVqI=; b=pTJf7TqmAJtm3XqeNJxUY2yohKJcGkr4wN2/MTNA1O4O/BnEJfs29oIuACUJkt949P CRSj1FYR7hamahUbZLnAW3NLrxODaFQveYkQOeNpIiIaBl5CxW+0qUeQNbBH+POxEKJ/ ztgG7pv1zEGUqJ4VS6V54Ar2nr1a8HHKd8dkflKQ1OZx63VsSZRNkM/ER9eqGOU7+j9l G1mYlgDu77tKBjrShfYthmxltr0POVYqkGRzb6zFiAs2BTLTji8QHTAbViH/qBZ8Ei3l KnJsGgUwYqFzZuSYhc5Vb+B83J+86KKupXOExZiR487sHvdX8QPLEE9PiPuxdYEFle3r aoEQ== X-Gm-Message-State: APjAAAUZZWcAxkP8XnJjRlvtELzQXekLRKY0lagx09jNSCEt6shL8nkJ 1XmQVZJK+z0PVODl1SV2i4+hQcKT0Bs= X-Google-Smtp-Source: APXvYqx9qSkZCtVDq63bZZymF+Ff8Yksqbjq9dYLmHQo8rgf+5KUz1nn2/zhq0di+C+M8MlHOgZwtw== X-Received: by 2002:a1c:6045:: with SMTP id u66mr9585035wmb.133.1552296366964; Mon, 11 Mar 2019 02:26:06 -0700 (PDT) Received: from localhost (141.255.76.34.bc.googleusercontent.com. [34.76.255.141]) by smtp.gmail.com with ESMTPSA id a8sm4579864wrt.79.2019.03.11.02.26.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2019 02:26:06 -0700 (PDT) From: Junio C Hamano To: git@vger.kernel.org Cc: =?utf-8?q?Martin_=C3=85gren?= Subject: [PATCH v3 2/3] Documentation/Makefile: add missing dependency on asciidoctor-extensions Date: Mon, 11 Mar 2019 18:26:04 +0900 Message-Id: <20190311092605.259322-2-gitster@pobox.com> X-Mailer: git-send-email 2.21.0-155-ge902e9bcae In-Reply-To: <20190311092605.259322-1-gitster@pobox.com> References: <20190311092605.259322-1-gitster@pobox.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Martin Ågren asciidoctor-extensions.rb has never changed, but when it does -- such as in the next commit --, it helps if the xml-files depend on it. We're casting the net a bit too wide here, since we'll be rebuilding even with AsciiDoc, which won't look at this file. But since this file changes so rarely, that should be ok. It's better than missing a dependency. Similarly, most of the html-files are produced directly from ".txt'; make the html-files too depend on asciidoctor-extensions.rb, both the HTMLified manual pages as well as the user-manual that does use .xml intermediary. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- Documentation/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index ea6b8e5d72..f58904a929 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -334,12 +334,12 @@ clean: $(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) manpage-base-url.xsl -$(MAN_HTML): %.html : %.txt asciidoc.conf +$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -d manpage -o $@+ $< && \ mv $@+ $@ -$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf +$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -o $@+ $< && \ mv $@+ $@ @@ -351,12 +351,12 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_XMLTO)$(RM) $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -%.xml : %.txt asciidoc.conf +%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_XML) -d manpage -o $@+ $< && \ mv $@+ $@ -user-manual.xml: user-manual.txt user-manual.conf +user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_XML) -d book -o $@+ $< && \ mv $@+ $@ From patchwork Mon Mar 11 09:26:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 10847003 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43363139A for ; Mon, 11 Mar 2019 09:26:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C04128E29 for ; Mon, 11 Mar 2019 09:26:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2021328E88; Mon, 11 Mar 2019 09:26:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBB1428E29 for ; Mon, 11 Mar 2019 09:26:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727118AbfCKJ0L (ORCPT ); Mon, 11 Mar 2019 05:26:11 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55446 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727017AbfCKJ0L (ORCPT ); Mon, 11 Mar 2019 05:26:11 -0400 Received: by mail-wm1-f67.google.com with SMTP id q187so3606924wme.5 for ; Mon, 11 Mar 2019 02:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=utjyoUHjK9rYWafxvafvygkE7i4paZkW+hXf0ZD0Lxw=; b=bA2+cnt3X7cpmDnyf8jD6mn7NLmaD4R7Ptur1d90g2c1n5EkH5iFgI9qbjFdog4SgN jFnxH33He1SjXErn1SWVQBc+n48jGZZ9BpT0awYzOn4i5la9uF9+N8G6FExkiFaiJZyO P+w7sQ+uY3zbEc9uzC25GO/r2j4gc15JB+iXdZ3cSaV574vNBfgrkGsTJ72vWlmRbTa5 sT5AwC2bEh3W2E85en1USULaB7cpivKbux5tkAvOtKEx6W40ijp40JRmdkih7x8Zeex4 OE9BVuLjWOlX56gNR4Sv+DC2uEUnTffWKn+E/4ugdV5A97Zxdx7gvtSFa6BjzQJpSKQP QQ+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=utjyoUHjK9rYWafxvafvygkE7i4paZkW+hXf0ZD0Lxw=; b=hTbxEM/DdHw+IhIqLyVqbn53KyakyMfMpSxMPIKNDFcU1+Iil2aB6HlLlHSeb2C0ob bqcu0FxsOLujNvP79JOaYyhF3qkFNpJyUzNfstbzY7EbP/+3LwWf51B60RWBWehyN+ps kQusmhc1afrvyU3tXPvHo+LPz3wdc1H4EVDHQdKI7E56YIvALp/I2jMqmY7fLxbRG9dr bicv7ZIsYo9A2xX+TfnZIqEIr/qrMMoMorDVRxWF5NhjmW6z6W1BbJrRO0H5V4f98xgg Sw8YG2ibLDL3KpHVnYUBt0pqIk6f4wIRDa+Vdwl4lhRlfRz5J4Rc7w1wJChOMqSLfXuG LJYA== X-Gm-Message-State: APjAAAU5dtplr/+cRXM8K47uVfBmcDPCl+0AL/M5MzgfoU4OrHpB7eVY dB2AZ0x5r71MKfO6z8Q281G3MXkaS4Q= X-Google-Smtp-Source: APXvYqyJ6WPofqXDbGzLzJ58NLnqK3X6+ExLu+D8YMY2D6Ffq8eEbucXh+9wXMTURodPQtDq8dFJrA== X-Received: by 2002:a1c:b783:: with SMTP id h125mr15701964wmf.119.1552296368571; Mon, 11 Mar 2019 02:26:08 -0700 (PDT) Received: from localhost (141.255.76.34.bc.googleusercontent.com. [34.76.255.141]) by smtp.gmail.com with ESMTPSA id i4sm4547665wrw.19.2019.03.11.02.26.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2019 02:26:07 -0700 (PDT) From: Junio C Hamano To: git@vger.kernel.org Cc: =?utf-8?q?Martin_=C3=85gren?= Subject: [PATCH v3 3/3] asciidoctor-extensions: fix spurious space after linkgit Date: Mon, 11 Mar 2019 18:26:05 +0900 Message-Id: <20190311092605.259322-3-gitster@pobox.com> X-Mailer: git-send-email 2.21.0-155-ge902e9bcae In-Reply-To: <20190311092605.259322-1-gitster@pobox.com> References: <20190311092605.259322-1-gitster@pobox.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Martin Ågren When we render, e.g., "linkgit:gitglossary[7]." with Asciidoctor, we get "gitglossary(7) ." with a space between the linkgit macro expansion and the punctuation. We can fix this by dropping the trailing newline after we've turned `linkgit:foo[bar]` into `..`. The diff produced by `USE_ASCIIDOCTOR=Yes ./doc-diff HEAD^ HEAD` is almost 6000 lines large and shows how this fixes "git-foo(x) ,", "(see git-bar(y) )" and so on. One might wonder whether this also turns, e.g., "see linkgit:foo[1] for more" into "see foo(1)for more", but no. We get "... for more" in the XML, see, e.g., git-am.xml, so the space ends up in git-am.1 just fine. The same is true for the HTML output. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- Documentation/asciidoctor-extensions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb index ec83b4959e..0089e0cfb8 100644 --- a/Documentation/asciidoctor-extensions.rb +++ b/Documentation/asciidoctor-extensions.rb @@ -11,12 +11,12 @@ module Git def process(parent, target, attrs) if parent.document.basebackend? 'html' prefix = parent.document.attr('git-relative-html-prefix') - %(#{target}(#{attrs[1]})\n) + %(#{target}(#{attrs[1]})) elsif parent.document.basebackend? 'docbook' "\n" \ "#{target}" \ "#{attrs[1]}\n" \ - "\n" + "" end end end