Changeset 99118 in vbox for trunk/doc

Timestamp:

Mar 22, 2023 3:45:33 PM (2 years ago)

Author:

vboxsync

Message:

manual: Revised r156481 a bit, since nested args are used in different ways, so must require role=compact for complicated arguments.

Location:

trunk/doc/manual

Files:

• docbook-refentry-to-C-help.xsl (modified) (2 diffs)
• docbook2latex.xsl (modified) (2 diffs)
• en_US/man_VBoxManage-controlvm.xml (modified) (1 diff)

trunk/doc/manual/docbook-refentry-to-C-help.xsl

@@ -269 +269 @@
         <xsl:when test="parent::group and ancestor::*[@role='compact']"><xsl:value-of select="$arg.or.sep.compact"/></xsl:when>
         <xsl:when test="parent::group"><xsl:value-of select="$arg.or.sep"/></xsl:when>
-        <xsl:when test="parent::arg"></xsl:when>
+        <xsl:when test="ancestor::*[@role='compact']"></xsl:when>
         <xsl:when test="ancestor::*/@sepchar"><xsl:value-of select="ancestor::*/@sepchar"/></xsl:when>
         <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
@@ -304 +304 @@
         <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.close.str"/></xsl:when>
       </xsl:choose>
+      <!-- Add a space padding if we're the last element in a repeating arg or group -->
+      <!-- 2023-03-22 bird: This is incorrectly written. Fix as needed...
+      <xsl:if test="(parent::arg or parent::group) and not(following-sibiling) and not(ancestor::*[@role='compact'])">
+        <xsl:text> </xsl:text>
+      </xsl:if>
+      -->
     </xsl:if>
   </xsl:template>

trunk/doc/manual/docbook2latex.xsl

@@ -971 +971 @@
         <xsl:when test="parent::group and ancestor::*[@role='compact']"><xsl:text>\textrm{</xsl:text><xsl:value-of select="$arg.or.sep.compact.tex"/><xsl:text>}</xsl:text></xsl:when>
         <xsl:when test="parent::group"><xsl:text>\textrm{</xsl:text><xsl:value-of select="$arg.or.sep.tex"/><xsl:text>}</xsl:text></xsl:when>
-        <xsl:when test="parent::arg"></xsl:when>
+        <xsl:when test="ancestor::*[@role='compact']"></xsl:when>
         <xsl:when test="ancestor::*/@sepchar"><xsl:value-of select="ancestor::*/@sepchar"/></xsl:when>
         <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
@@ -1007 +1007 @@
       <xsl:when test="@choice = 'req'">               <xsl:text>\textrm{</xsl:text><xsl:value-of select="$arg.choice.req.close.str"/><xsl:text>}</xsl:text></xsl:when>
     </xsl:choose>
+
+    <!-- add space padding if we're the last element in a nested arg -->
+    <!-- 2023-03-22 bird: This is incorrectly written. Fix as needed...
+    <xsl:if test="(parent::arg or parent::group) and not(following-sibling) and not(ancestor::*[@role='compact'])">
+      <xsl:text> </xsl:text>
+    </xsl:if> -->
   </xsl:template>
 

trunk/doc/manual/en_US/man_VBoxManage-controlvm.xml

@@ -422 +422 @@
       <arg choice="req"><replaceable>yres</replaceable></arg>
       <arg choice="req"><replaceable>bpp</replaceable></arg>
-      <arg><arg><replaceable>display</replaceable></arg><group>
-          <arg choice="plain">enabled:yes | no</arg>
-          <arg><replaceable>x-origin</replaceable>&nbsp;<replaceable>y-origin</replaceable></arg>
-        </group></arg>
+      <arg>
+        <replaceable>display</replaceable>
+        <arg>
+          <group choice="req">
+            <arg choice="plain">yes</arg>
+            <arg choice="plain">no</arg>
+          </group>
+          <arg>
+            <arg choice="plain"><replaceable>x-origin</replaceable></arg>
+            <arg choice="plain"><replaceable>y-origin</replaceable></arg>
+          </arg>
+        </arg>
+      </arg>
     </cmdsynopsis>