averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/doc-markup-updates-fix'

Browse Source 
Work around asciidoctor's css that renders `monospace` material
in the SYNOPSIS section of manual pages as block elements.

* js/doc-markup-updates-fix:
  Doc: fix Asciidoctor css workaround
  asciidoctor: fix `synopsis` rendering
This commit is contained in:
Junio C Hamano
2024-07-23 16:54:34 -07:00
parent 37b959ecfb d44ce6ddd5
commit 6fcd72d5ad
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/Makefile
View File

@@ -204,12 +204,15 @@ ASCIIDOC_DOCBOOK = docbook5
ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
ASCIIDOC_EXTRA += -adocinfo=shared
ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
DBLATEX_COMMON = DBLATEX_COMMON =
XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += --skip-validation
XMLTO_EXTRA += -x manpage.xsl XMLTO_EXTRA += -x manpage.xsl
endif endif
ASCIIDOC_DEPS += docinfo.html
SHELL_PATH ?= $(SHELL) SHELL_PATH ?= $(SHELL)
# Shell quote; # Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -338,6 +341,9 @@ clean:
$(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) GIT-ASCIIDOCFLAGS $(RM) GIT-ASCIIDOCFLAGS
docinfo.html: docinfo-html.in
$(QUIET_GEN)$(RM) $@ && cat $< >$@
$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $< $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<

5
Documentation/docinfo-html.in Normal file
View File

@@ -0,0 +1,5 @@
<style>
pre>code {
display: inline;
}
</style>