commit c60cd3c0d553b740c04bad2f6a00b036dce02198 Author: Ulrich Müller Date: Thu Feb 5 10:57:48 2026 +0100 names, pkg-mgr-commands: Clarify "suffix" and "version component" Closes: https://bugs.gentoo.org/969629 Signed-off-by: Ulrich Müller diff --git a/names.tex b/names.tex index fa7c51d..fdae0ff 100644 --- a/names.tex +++ b/names.tex @@ -67,9 +67,9 @@ A version starts with the number part, which is in the form \t{[0-9]+(\textbacks This may optionally be followed by one of \t{[a-z]} (a lower-case letter). -This may be followed by zero or more of the suffixes \t{_alpha}, \t{_beta}, \t{_pre}, \t{_rc} -or \t{_p}, each of which may optionally be followed by an unsigned integer. Suffix and integer -count as separate version components. +This may be followed by zero or more suffixes. Each suffix consists of one of the strings +\t{_alpha}, \t{_beta}, \t{_pre}, \t{_rc} or \t{_p}, optionally followed by an unsigned integer. +String part and integer part of the suffix count as separate version components. This may optionally be followed by the suffix \t{-r} followed immediately by an unsigned integer (the ``revision number''). If this suffix is not present, it is assumed to be \t{-r0}. diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index 3f5592b..9e0294f 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -1048,9 +1048,10 @@ For the purpose of version manipulation commands, the specification provides a m an arbitrary version string (not necessarily conforming to section~\ref{sec:version-spec}) into a series of version components and version separators. -A version component consists either purely of digits (\t{[0-9]+}) or purely of upper- and -lower-case ASCII letters (\t{[A-Za-z]+}). A version separator is either a string of any other +In the context of this section, a \i{version component} consists either purely of digits +(\t{[0-9]+}) or purely of upper- and lower-case ASCII letters (\t{[A-Za-z]+}). +A \i{version separator} is either a string of any other characters (\t{[\textasciicircum A-Za-z0-9]+}), or it occurs at the transition between a sequence of digits and a sequence of letters, or vice versa. In the latter case, the version separator is an empty string.