On Tue, Mar 26, 2019 at 09:06:03PM -0400, Todd Zullinger wrote:
> > I updated to asciidoctor-2.0.1 this morning to test, in case
> > it was one of the issues fixed since the 2.0.0 release.
> > Alas, we're the first to hit it and report it.
>
> Dan Allen fixed this upstream and released 2.0.2 today.
> It's very good to know that asciidoctor upstream is
> incredibly responsive. If anyone runs into Dan at a
> conference, please buy him a beer. ;)
Cool. I've interacted a few times with the asciidoctor project due to
our use on git-scm.com, and have always found them pleasant and
responsive.
> There's still the matter of 2.0 dropping docbook45. I'll
> try to get around to testing 1.5.x releases with docbook5 to
> see if they work reasonably well. If not, we can add a
> version check and set ASCIIDOC_DOCBOOK appropriately.
With the hacky patch below, I was able to doc-diff the v1.5.8 versus
v2.0.2 output. It looks like there are quite a few cosmetic whitespace
changes. Some probably intentional (extra blank between terms and
paragraphs in a definition list) and some probably not (extra whitespace
before start of content in a bulleted list).
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 3355be4798..4c2dccf516 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -17,9 +17,11 @@ f force rebuild; do not rely on cached results
c,clean cleanup temporary working files
from-asciidoc use asciidoc with the 'from'-commit
from-asciidoctor use asciidoctor with the 'from'-commit
+from-asciidoctor2 use asciidoctor2 with the 'from'-commit
asciidoc use asciidoc with both commits
to-asciidoc use asciidoc with the 'to'-commit
to-asciidoctor use asciidoctor with the 'to'-commit
+to-asciidoctor2 use asciidoctor with the 'to'-commit
asciidoctor use asciidoctor with both commits
cut-header-footer cut away header and footer
"
@@ -55,6 +57,10 @@ do
--asciidoc)
from_program=-asciidoc
to_program=-asciidoc ;;
+ --from-asciidoctor2)
+ from_program=-asciidoctor2 ;;
+ --to-asciidoctor2)
+ to_program=-asciidoctor2 ;;
--cut-header-footer)
cut_header_footer=-cut-header-footer ;;
--)
@@ -112,6 +118,13 @@ construct_makemanflags () {
elif test "$1" = "-asciidoctor"
then
echo USE_ASCIIDOCTOR=YesPlease
+ elif test "$1" = "-asciidoctor2"
+ then
+ echo USE_ASCIIDOCTOR=YesPlease
+ echo ASCIIDOC_DOCBOOK=docbook5
+ echo XMLTO_EXTRA=--skip-validation
+ # not really portable :)
+ echo ASCIIDOCTOR=/tmp/run-asciidoctor-2
fi
}
@@ -182,6 +195,6 @@ render_tree () {
fi
}
-render_tree $from_oid $from_dir $from_makemanflags &&
-render_tree $to_oid $to_dir $to_makemanflags &&
+render_tree $from_oid $from_dir "$from_makemanflags" &&
+render_tree $to_oid $to_dir "$to_makemanflags" &&
git -C $tmp/rendered diff --no-index "$@" $from_dir $to_dir
