Big number itself does not make much sense in some cases. Format the bitshift format as well. Changes our web page docs from: VIR_MIGRATE_POSTCOPY = 32768 : Setting the VIR_MIGRATE_POSTCOPY... VIR_MIGRATE_TLS = 65536 : Setting the VIR_MIGRATE_TLS flag... to: VIR_MIGRATE_POSTCOPY = 32768 (0x8000; 1 << 15) : Setting the VIR_MIGRATE_POSTCOPY... VIR_MIGRATE_TLS = 65536 (0x10000; 1 << 16) : Setting the VIR_MIGRATE_TLS flag... Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- docs/apibuild.py | 10 ++++++++++ docs/libvirt.css | 4 ++++ docs/newapi.xsl | 22 ++++++++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 3ef5d0f554..9e04871220 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2117,12 +2117,22 @@ class docBuilder: self.modulename_file(id.header))) if id.info is not None: info = id.info + valhex = "" if info[0] is not None and info[0] != '': try: val = eval(info[0]) + valhex = hex(val) except: val = info[0] output.write(" value='%s'" % (val)) + + if valhex != "": + output.write(" value_hex='%s'" % (valhex)) + + m = re.match("\(?1<<(\d+)\)?", info[0]) + if m: + output.write(" value_bitshift='%s'" % (m.group(1))) + if info[2] is not None and info[2] != '': output.write(" type='%s'" % info[2]) if info[1] is not None and info[1] != '': diff --git a/docs/libvirt.css b/docs/libvirt.css index e590b33cfb..c5fe27fa3f 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -537,3 +537,7 @@ dl.mail dt a:hover { color: rgb(255, 230, 0); text-decoration: none; } + +td.enumvalue { + white-space: nowrap; +} diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 8d4c032c03..c808fe5ff8 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -288,6 +288,24 @@ </xsl:choose> </xsl:template> + <xsl:template name="enumvalue"> + <xsl:param name="value" select="@value"/> + <xsl:param name="valuehex" select="@value_hex"/> + <xsl:param name="valuebitshift" select="@value_bitshift"/> + <xsl:value-of select="@value"/> + <xsl:if test="$valuehex != '' or $valuebitshift != ''"> + <xsl:text> (</xsl:text> + <xsl:if test="$valuehex != ''"> + <xsl:value-of select="@value_hex"/> + </xsl:if> + <xsl:if test="$valuebitshift != ''"> + <xsl:text>; 1 &lt;&lt; </xsl:text> + <xsl:value-of select="@value_bitshift"/> + </xsl:if> + <xsl:text>)</xsl:text> + </xsl:if> + </xsl:template> + <xsl:template match="typedef[@type = 'enum']"> <xsl:variable name="name" select="string(@name)"/> <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> @@ -306,7 +324,7 @@ <td><xsl:text> = </xsl:text></td> <xsl:choose> <xsl:when test="@info != ''"> - <td><xsl:value-of select="@value"/></td> + <td class="enumvalue"><xsl:call-template name="enumvalue"/></td> <td> <div class="comment"> <xsl:call-template name="dumptext"> @@ -316,7 +334,7 @@ </td> </xsl:when> <xsl:otherwise> - <td colspan="2"><xsl:value-of select="@value"/></td> + <td colspan="2" class="enumvalue"><xsl:call-template name="enumvalue"/></td> </xsl:otherwise> </xsl:choose> </tr> -- 2.20.1

Bump the width to 85em while keeping a maximum width of 90%. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- docs/libvirt.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index c5fe27fa3f..dcae2a338a 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -100,14 +100,15 @@ margin-right: auto; padding: 0px; padding-bottom: 1em; - max-width: 60em; + max-width: 90%; + width: 85em; } body.index #content, body.docs #content, body.hvsupport #content { - max-width: inherit; + width: inherit; } pre { -- 2.20.1

On Wed, Jan 30, 2019 at 16:31:56 +0000, Daniel Berrange wrote: 70em is okay for me. Basically the reason was that 60em does not even fill my portrait monitor with rather oldschool resolution and e.g. in cases of the enum description boxes the description gets too many linebreaks which are harder to follow if the line does not start at the left border. Said that, my screen is not much wider than the 60em we have normally but I'm not entirely a fan of excesive borders or no borders at all. That's the reason to change max-width to a percent measurement and set width. In this case I'd even change it to 95% which leaves enough border. In the end none of this is critical. I have lots of CSS overrides for many webpages so I can install one more :)