@@ -128,7 +128,10 @@ def texi_body(doc):
def texi_enum_value(value):
"""Format a table of members item for an enumeration value"""
- return '@item @code{%s}\n' % value.name
+ return '@item @code{%s}%s\n' % (
+ value.name,
+ '\n@b{If:} @code{%s}\n' %
+ ', '.join(value.ifcond) if value.ifcond else '')
def texi_member(member, suffix=''):
@@ -55,7 +55,9 @@
#
# @two is undocumented
##
-{ 'enum': 'Enum', 'data': [ 'one', 'two' ], 'if': 'defined(IFCOND)' }
+{ 'enum': 'Enum', 'data':
+ [ { 'name': 'one', 'if': 'defined(IFENUM)' }, 'two' ],
+ 'if': 'defined(IFCOND)' }
##
# @Base:
@@ -2,6 +2,7 @@ object Base
member base1: Enum optional=False
enum Enum
member one
+ if ['defined(IFENUM)']
member two
if ['defined(IFCOND)']
object Object
@@ -81,6 +81,8 @@ Examples:
@b{Values:}
@table @asis
@item @code{one}
+@b{If:} @code{defined(IFENUM)}
+
The @emph{one} @{and only@}
@item @code{two}
Not documented
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- scripts/qapi2texi.py | 5 ++++- tests/qapi-schema/doc-good.json | 4 +++- tests/qapi-schema/doc-good.out | 1 + tests/qapi-schema/doc-good.texi | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-)