Conflict with Jun T's texi2any patch

Conflict with Jun T's texi2any patch

[Bart Schaefer]

This must be something I had left unposted -- I added "makeinfo" fallbacks:

++<<<<<<< HEAD
 +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [makeinfo --pdf])
 +AC_CHECK_PROGS([TEXI2HTML], [texi2html], [makeinfo --html])
++=======
+ AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
+ AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html])
+ 
+ if test x"$TEXI2HTML" = xtexi2any; then
+   TEXI2HTML='texi2any -c TEXI2HTML=1'
+ fi
+ 
++>>>>>>> master


I presume texi2any can replace texi2pdf as well, if that's not found?

Re: Conflict with Jun T's texi2any patch

[Peter Stephenson]

On Fri, 22 May 2015 10:05:46 -0700
Bart Schaefer <schaefer@brasslantern.com> wrote:
> I presume texi2any can replace texi2pdf as well, if that's not found?

The limited research I can be bothered with suggests texi2any, while it
does have a PDF mode, actually depends on texi2dvi/texi2pdf in texinfo 5.

pws

Re: Conflict with Jun T's texi2any patch

[Daniel Shahaf]

[ This is about git conflicts, not about texinfo. ]

Bart Schaefer wrote on Fri, May 22, 2015 at 10:05:46 -0700:
> This must be something I had left unposted -- I added "makeinfo" fallbacks:
> 
> ++<<<<<<< HEAD
>  +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [makeinfo --pdf])
>  +AC_CHECK_PROGS([TEXI2HTML], [texi2html], [makeinfo --html])
> ++=======
> + AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
> + AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html])
> + 
> + if test x"$TEXI2HTML" = xtexi2any; then
> +   TEXI2HTML='texi2any -c TEXI2HTML=1'
> + fi
> + 
> ++>>>>>>> master
> 

I find conflicts easier to resolve when 'git config --global
merge.conflictstyle=diff3' is set: <<< foo ||| bar === baz >>> can then
be resolved by applying to foo the changes that make bar into baz, which
is usually an almost mechanical change.  The two-side form quoted above
lacks bar.

Here's a comparison of the two-sided and three-sided forms:
https://subversion.apache.org/docs/release-notes/1.9#three-way-conflict-markers

Re: Conflict with Jun T's texi2any patch

[Jun T.]

2015/05/23 02:05, Bart Schaefer <schaefer@brasslantern.com> wrote:

> +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [makeinfo --pdf])

> I presume texi2any can replace texi2pdf as well, if that's not found?

With texinfo-4.13, makeinfo does not support the option --pdf.

With texinfo-5.2, makeinfo (= texi2any) supports --pdf, but if I try

$ texi2any --pdf zsh.texi

then it fails as

zsh.texi:70: @menu seen before first @node

This is strange, because, as Peter wrote, texi2any can't produce pdf
by itself but calls 'texi2dvi --pdf'. Or at least the documentation
of texi2any says so.
('texi2pdf zsh.texi' or 'texi2dvi --pdf zsh.texi' works, of course).

Anyway I think if there is texi2any then there should be texi2dvi and
texi2pdf, unless a user (or a package manager) installed texinfo in a
very strange way.

texi2pdf (texinfo 4 or 5) is just a wrapper script for 'texi2dvi --pdf'.
If $(TEXI2PDF) is empty, then Doc/Makefile.in calls 'texi2dvi --pdf'
instead. So I think if texi2pdf is not found then leaving $(TEXI2PDF)
empty is OK (if texi2dvi does not exist then 'texi2any --pdf' will fail
even if the above problem has been fixed).

Or is it better to check the existence of texi2dvi in configure?