From: Jonathan Corbet <corbet@lwn.net>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH 1/2] Docs: An initial automarkup extension for sphinx
Date: Fri, 26 Apr 2019 13:37:19 -0600 [thread overview]
Message-ID: <20190426133719.5d30d4a4@lwn.net> (raw)
In-Reply-To: <20190426153255.7e424a45@coco.lan>
On Fri, 26 Apr 2019 15:32:55 -0300
Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:
> > +# Try to identify "function()" that's not already marked up some
> > +# other way. Sphinx doesn't like a lot of stuff right after a
> > +# :c:func: block (i.e. ":c:func:`mmap()`s" flakes out), so the last
> > +# bit tries to restrict matches to things that won't create trouble.
> > +#
> > +RE_function = re.compile(r'(^|\s+)([\w\d_]+\(\))([.,/\s]|$)')
>
> IMHO, this looks good enough to avoid trouble, maybe except if one
> wants to write a document explaining this functionality at the
> doc-guide/kernel-doc.rst.
Adding something to the docs is definitely on my list.
> Anyway, the way it is written, we could still explain it by adding
> a "\ " after the func, e. g.:
>
> When you write a function like: func()\ , the automarkup
> extension will automatically convert it into:
> ``:c:func:`func()```.
>
> So, this looks OK on my eyes.
Not sure I like that; the whole point is to avoid extra markup here. Plus
I like that it catches all function references whether the author thought
to mark them or not.
> > +#
> > +# Lines consisting of a single underline character.
> > +#
> > +RE_underline = re.compile(r'^([-=~])\1+$')
>
> Hmm... why are you calling this "underline"? Sounds a bad name to me,
> as it took me a while to understand what you meant.
Seemed OK to me, but I can change it :)
> From the code I'm inferring that this is meant to track 3 of the
> possible symbols used as a (sub).*title markup. On several places
> we use other symbols:'^', '~', '.', '*' (and others) as sub-sub(sub..)
> title markups.
I picked the ones that were suggested in our docs; it was enough to catch
all of the problems in the current kernel docs.
Anyway, The real documentation gives the actual set, so I'll maybe make it:
=-'`":~^_*+#<>
I'd prefer that to something more wildcardish.
> You should probably need another regex for the title itself:
>
> RE_possible_title = re.compile(r'^(\S.*\S)\s*$')
>
> in order to get the size of the matched line. Doing a doing len(previous)
> will get you false positives.
This I don't quite get. It's easy enough to trim off the spaces with
strip() if that turns out to be a problem (which it hasn't so far). I can
add that.
> on a separate matter (but related to automarkup matter - and to what
> I would name underline), as a future feature, perhaps we could also add
> a parser for:
>
> _something that requires underlines_
>
> Underlined text is probably the only feature that we use on several docs
> with Sphinx doesn't support (there are some extensions for that - I guess,
> but it sounds simple enough to have a parser here).
>
> This can be tricky to get it right, as just underlines_ is a
> cross reference markup - so, I would only add this after we improve the
> script to come after Sphinx own markup processing.
That does indeed sound tricky. It would also probably have to come
*before* Sphinx does its thing or it's unlikely to survive.
> > + #
> > + # Is this an underline line? If so, and it is the same length
> > + # as the previous line, we may have mangled a heading line in
> > + # error, so undo it.
> > + #
> > + elif RE_underline.match(line):
> > + if len(line) == len(previous):
>
> No, that doesn't seem enough. I would, instead, use the regex I
> proposed before, in order to check if the previous line starts with
> a non-space, and getting the length only up to the last non-space
> (yeah, unfortunately, we have some text files that have extra blank
> spaces at line's tail).
So I'll make it "if len(line) == len(previous.strip())
Thanks,
jon
next prev parent reply other threads:[~2019-04-26 19:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 20:01 [PATCH 0/2] RFC: Automatic :c:func: annotation in the sphinx build Jonathan Corbet
2019-04-25 20:01 ` [PATCH 1/2] Docs: An initial automarkup extension for sphinx Jonathan Corbet
2019-04-26 9:06 ` Jani Nikula
2019-04-26 11:31 ` Markus Heiser
2019-04-26 16:52 ` Jonathan Corbet
2019-04-26 17:54 ` Mauro Carvalho Chehab
2019-04-26 18:58 ` Jani Nikula
2019-04-26 18:32 ` Mauro Carvalho Chehab
2019-04-26 19:16 ` Mauro Carvalho Chehab
2019-04-26 19:37 ` Jonathan Corbet [this message]
2019-04-26 20:51 ` Mauro Carvalho Chehab
2019-04-25 20:01 ` [PATCH 2/2] docs: remove :c:func: annotations from xarray.rst Jonathan Corbet
2019-04-25 20:43 ` Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190426133719.5d30d4a4@lwn.net \
--to=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).