-
Notifications
You must be signed in to change notification settings - Fork 60
gen-eclass-html.sh: Fix tildes' #378
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
Conversation
|
Can you give an example of an eclass where this is a problem? |
|
@ulm It's in the commit message. Not an eclass afaik https://devmanual.gentoo.org/eclass-reference/ebuild/index.html |
I see. However, there are also phrases like 'KEYWORDS = [-ti][x86,ppc,sparc,mips,alpha,arm,hppa,...]' and 'ACCEPT_KEYWORDS will be set to "amd64 tiamd64"' and your fix doesn't catch these. |
Can you show one please? |
|
Search for these strings in https://devmanual.gentoo.org/eclass-reference/ebuild/index.html? |
|
Ah shit... yeah! You're right. ;-/ Do you want to expand the regex for now to cover any corner cases until we later switch to a better man convert? |
|
This Portage fix broke it: gentoo/portage@3b1e073 Maybe we could use |
|
|
|
Maybe we could switch to app-text/mandoc for conversion, AFAICS it renders |
Unfortunately mandoc's style sheet collides with ours (for example, which is terrible from a semantic point of view. |
I'm certainly no groff expert; if the alternate syntax works I have no objection. |
groff_char(7) lists it: |
Yeah, you have my support for trying to switch to anything other than man2html. In fact i suggested we do this from the start someday instead of trying to hack around man2html Maybe poke at pandoc? |
You can pass Im not sure what the issue is with what you posted, sorry |
|
Anyway, I think the plan is:
|
Ill just woke up, so happy to tackle it in a moment. Ive never messed with manpages directly so i wanna get some hands on experience. Plus, want to make sure that |
pandoc is slow. Real time to process all eclass manpages:
As I said above, the plan is to get rid of the conversion for the eclass manpages, so now is not a good time to change the conversion tool. Once we are left with ebuild.5 and make.conf.5 only, we can reconsider. |
Tell me something new 😅 Didnt consider the speed though, so we'll try your suggestion |
|
@ulm It worked! Gonna send a patch to portage, apply those and then you can run it here :) |
Workaround for an issue caused by 3b1e073. man2html (and possibly others) seem to have trouble parsing \(ti, so instead switch to \[ti]. This results in man2html generating it as [ti], which we can then sed with ~. See: gentoo/devmanual#378 Signed-off-by: Swagtoy <[email protected]>
… character Seen in ebuild(5). Signed-off-by: Swagtoy <[email protected]>
Ensures that MANPATH is checked, especially so in cases where manpages reside in /usr/local. Signed-off-by: Swagtoy <[email protected]>
|
Attached is another patch. Feel free to cherry pick it if you'd like |
| $(man --path 5 ebuild)* | ||
| $(man --path 5 make.conf)* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope. a) We know that Portage installs its manpages in /usr/share/man/, and b) --path is not portable between the different providers of virtual/man.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Portage does, but meson does not unless you specify (i think?). Was useful for me to test my patch.
We could also just || echo
Anyway, you can just not cherry pick it.
Workaround for an issue caused by 3b1e073. man2html (and possibly others) seem to have trouble parsing \(ti, so instead switch to \[ti]. This results in man2html generating it as [ti], which we can then sed with ~. See: gentoo/devmanual#378 Closes: #1480 Signed-off-by: Swagtoy <[email protected]> Signed-off-by: Mike Gilbert <[email protected]>
|
Thank you, I've cherry picked the first commit. Closing. It may take some time (e.g. we need a new portage release) before the changes will be visible on the site. |
|
Awesome. Thanks 👍 |
Exactly what it says on the box.
Probably worth considering using another manpage parser like pandoc or something one day, it looks like we sed many things here. For now let's just grow that list of replacements.