xkbcomp: Changes to 'master'

[GitLab Mirror]

 keytypes.c      |    2 -
 man/xkbcomp.man |   72 +++++++++++++++++++++++++++++++-------------------------
 symbols.c       |    6 +++-
 xkbcomp.c       |    6 +++-
 4 files changed, 50 insertions(+), 36 deletions(-)

New commits:
commit 38724ab9f0f013a7d684e5a410f72618603e29cc
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Mar 31 18:46:41 2025 -0700

    Improve man page formatting
    
    More closely follow common style as described on
    https://man7.org/linux/man-pages/man7/man-pages.7.html
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/merge_requests/30>

commit cd51404ec62a9d9f4480fc176bcd8c6231ab5900
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Mar 31 18:31:52 2025 -0700

    Accept --help & --version as aliases to -help & -version
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/merge_requests/30>

commit 9cb80be3bd01bab4eba6a8aea7767c36b2284845
Author: Pierre Le Marre <dev at wismill.eu>
Date:   Thu Jan 9 16:32:06 2025 +0100

    types: Fix warning for multiple map occurrences
    
    `AddMapEntry` may emit a warning even if told to not report. This is
    problematic when it is called by `CopyDefToKeyType`, as `AddMapEntry`
    is used there for adding default `map` entries corresponding to each
    `preserve` entry, only if relevant. These default entries should not
    trigger a warning (report = False) if conflicting with an existing entry
    and simply be ignored. However with the current code a warning may be
    erroneously emitted if one set the warning level >=9, leaving the user
    puzzled with a conflicting map entry found nowhere in the source files.
    
    Signed-off-by: Pierre Le Marre <dev at wismill.eu>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/merge_requests/27>

commit 374d8a12e9866ce3e2c0157c208b052abe701366
Author: Pierre Le Marre <dev at wismill.eu>
Date:   Fri Dec 27 00:47:23 2024 +0100

    Symbols: Fix out-of-bounds actions in MergeKeyGroups
    
    Signed-off-by: Pierre Le Marre <dev at wismill.eu>
    Part-of: <https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/merge_requests/26>