Merging dev/texi2html [was: Re: Clean history]

[John Mandereau]

2008/8/19 Reinhold Kainhofer <address@hidden>:
> git checkout master
> git merge dev/texi2html
>
> Done. Everything will work ;-)

Sorry, I meant merging (i.e. fast-forwarding) dev/texi2html into master.


> Hehe, yeah. I merged in master into dev/texi2html quite frequently, manually
> resolving the rare conflicts in the make files. So, basically, the "merge" is
> not really a merge any more, rather a "master should be exactly what
> dev/texi2html is". A simply "git merge dev/texi2html" in master will do
> exactly that, without any conflicts to resolve, since I've already done that
> in dev/texi2html.

I'd like this to happen as soon as possible, because I'd like to
rename some files (add_html_footer.py -> postprocess_html.py,
doclang-*.make -> doc-i18n-user-*.make) and enable PDF generation fr
the IR and the Spanish bigpage LM, which will be easier for me if we
use texi2html on master.  However, texi2html 1.79 has not been
released yet, we should wait for it before merging into master; I'm
bugging Patrice about this.


> I'm not aware of any major problems with dev/texi2html.

I forgot to update my CVS snapshot of texi2html, so I had strange
results, but I just updated it, I'll rebuild tonight.  Even if there
are no major problems, expect me to overhaul makefiles bits dealing
with .xref-map files:
* make rules are forbidden in {fr,es,de}/*GNUmakefiles, only variables
specific to each language are allowed there;
* hardcoding the list of our doc manuals in the .xref-map file list
makes makefiles not very maintainable;
* IMHO symlinking .xref-map files is a bit messy, it's cleaner to
write them in a toplevel directory e.g.
XREF_MAPS_DIR=(top-build-dir)/out/xref-maps and add
--I=$(XREF_MAPS_DIR) to texi2html command line.

I've started handling all this, I'll push to dev/texi2html when it works.


> Patrice now also fixed
> the issues with wrong relative pathes with @image calls.

Very cool!  I was going to bug you about this.


> Linkchecker finds hundreds of missing links, but that's mainly because several
> files are not installed by the build scripts, because there is no
> corresponding English file...

Yup, I'll try to sort and diff .xref-map files in different languages
to track and fix differences in node names between English and other
languages; this will make complete sectioning updates in translated
docs a lot easier.

Cheers,
John