Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Man-page improvements, including the ditchting of docbook2x #106

Merged
merged 3 commits into from
Jun 5, 2024

Conversation

bigsmoke
Copy link
Contributor

@bigsmoke bigsmoke commented Jun 3, 2024

The only dependency that is now left for building the man-pages is an XSLT processor. (The Makefile assumes xsltproc.)

@halfgaar
Copy link
Owner

halfgaar commented Jun 4, 2024

I don't quite understand Add missing container el and Document command-line args & cross ref. config stuff. It's the same duplication of sections and stuff we saw before?

@bigsmoke bigsmoke force-pushed the man-pure-xslt-groff branch 2 times, most recently from 8af6ba8 to e4d80a7 Compare June 4, 2024 13:59
@bigsmoke
Copy link
Contributor Author

bigsmoke commented Jun 4, 2024

My original mistake appears to be that I started working on this branch before the changes from my previous PR were merged into origin/master. (What is now 09cdb09 has been squeezed into 9538541 for origin/master previously.) The same goes for 2febd23.

I removed these two commits from my PR branch and resolved the new conflicts.

Also rebased on your newest master, so that you don't have to resolve the merge conflict on the documentation of your newest config file options.

@halfgaar
Copy link
Owner

halfgaar commented Jun 5, 2024

This is so cool:

image

I would like to frame it...

Too bad Debian turns the colors off by default, so few people will see it.

There is a slight generation problem in the html version though:

image

Both literals name flashmq.conf as stray string.

Rowan Rodrik van der Molen added 3 commits June 5, 2024 14:39
This undoes Wiebe's revert (d5fc25e) of
my original commit 34a6081.

It also re-establishes the `<info><biblioid>` elements that Wiebe
removed in `a96f5cbd8c399da6fc17d358a0c114991011e1bc` to please the now
obsolete `docbook2x`.
@bigsmoke bigsmoke force-pushed the man-pure-xslt-groff branch from e4d80a7 to 5a301fa Compare June 5, 2024 13:40
@bigsmoke
Copy link
Contributor Author

bigsmoke commented Jun 5, 2024

Good catch! I've changed that template to only <xsl:apply-templates select="text()"/>, instead of node(). Previously, the attribute would be caught by node() and processed by the default template, and this only became noticeable with the extra attribute.

By the way: I have not (yet) implemented syntax highlighting for HTML. I'm inclined to use the same (XSLT-based) method, since all the XSLT is bound to this project anyway and I thus see no need for the use of a more general-purpose syntax-highlighting method.

@halfgaar halfgaar merged commit 5a301fa into halfgaar:master Jun 5, 2024
1 check passed
@halfgaar
Copy link
Owner

halfgaar commented Jun 5, 2024

It's merged 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants