VirtualBox

Changeset 79609 in vbox for trunk/doc


Ignore:
Timestamp:
Jul 8, 2019 11:25:29 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
131911
Message:

man_VBoxManage-clonemv.xml,xsl: Using a 'group' for alternative --mode parameter values doesn't match other nested group uses very well, so changed that to spell it out in full instead, at least for now. (need it for dhcpserver, or at least thought I did.) Also found that the 'arg|group' template in the latex and C-help stylesheets had gotten out of sync. bugref:9288

Location:
trunk/doc/manual
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r77887 r79609  
    246246      <xsl:choose>
    247247        <xsl:when test="parent::group"><xsl:value-of select="$arg.or.sep"/></xsl:when>
    248         <xsl:when test="parent::arg and self::group"></xsl:when>
    249248        <xsl:when test="ancestor-or-self::*/@sepchar"><xsl:value-of select="ancestor-or-self::*/@sepchar"/></xsl:when>
    250249        <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
    251250      </xsl:choose>
    252     </xsl:if>
    253 
    254     <!-- Make sure group choice and arg choice matches. -->
    255     <xsl:if test="self::arg and ancestor::group">
    256       <xsl:if test="@choice != ancestor::group/@choice and (@choice = 'opt' or @choice = '' or ancestor::group/@choice = 'opt' or ancestor::group/@choice = '')">
    257         <xsl:message terminate="yes"><xsl:call-template name="error-prefix"/>Mismatching group and arg choice: "<xsl:value-of select="@choice"/>" (arg) vs "<xsl:value-of select="ancestor::group/@choice"/>" (group)</xsl:message>
    258       </xsl:if>
    259251    </xsl:if>
    260252
    … …  
    277269    <xsl:choose>
    278270      <xsl:when test="@rep = 'norepeat' or not(@rep) or @rep = ''"/>
    279       <xsl:when test="@rep = 'repeat'">               <xsl:value-of select="$arg.rep.repeat.str"/></xsl:when>
     271      <xsl:when test="@rep = 'repeat'">                 <xsl:value-of select="$arg.rep.repeat.str"/></xsl:when>
    280272      <xsl:otherwise><xsl:message terminate="yes"><xsl:call-template name="error-prefix"/>Invalid rep choice: "<xsl:value-of select="@rep"/>"</xsl:message></xsl:otherwise>
    281273    </xsl:choose>
    … …  
    288280        <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.close.str"/></xsl:when>
    289281      </xsl:choose>
     282      <!-- Add a space padding if we're the last element in a repeating arg or group -->
     283      <xsl:if test="(parent::arg or parent::group) and not(following-sibiling)">
     284        <xsl:text> </xsl:text>
     285      </xsl:if>
    290286    </xsl:if>
    291287  </xsl:template>

  • TabularUnified trunk/doc/manual/docbook2latex.xsl

    r78514 r79609  
    894894      <xsl:message terminate="yes">sbr only supported inside cmdsynopsis (because of hangindent)</xsl:message>
    895895    </xsl:if>
    896     <xsl:text>\linebreak</xsl:text>
     896    <xsl:text>\newline</xsl:text>
    897897  </xsl:template>
    898898
    … …  
    959959  </xsl:template>
    960960
    961   <!-- duplicated in docbook2latex.xsl -->
     961  <!-- duplicated in docbook-refentry-to-C-help.xsl -->
    962962  <xsl:template match="arg|group">
    963963    <!-- separator char if we're not the first child -->
    … …  
    969969      </xsl:choose>
    970970    </xsl:if>
     971
    971972    <!-- open wrapping -->
    972     <xsl:choose>
    973       <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.open.str"/></xsl:when>
    974       <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.open.str"/></xsl:when>
    975       <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.open.str"/></xsl:when>
    976       <xsl:when test="@choice = 'plain'"/>
    977       <xsl:otherwise><xsl:message terminate="yes">Invalid arg choice: "<xsl:value-of select="@choice"/>"</xsl:message></xsl:otherwise>
    978     </xsl:choose>
     973    <xsl:variable name="fWrappers" select="not(ancestor::group)"/>
     974    <xsl:if test="$fWrappers">
     975      <xsl:choose>
     976        <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.open.str"/></xsl:when>
     977        <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.open.str"/></xsl:when>
     978        <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.open.str"/></xsl:when>
     979        <xsl:when test="@choice = 'plain'"/>
     980        <xsl:otherwise><xsl:message terminate="yes"><xsl:call-template name="error-prefix"/>Invalid arg choice: "<xsl:value-of select="@choice"/>"</xsl:message></xsl:otherwise>
     981      </xsl:choose>
     982    </xsl:if>
    979983
    980984    <!-- render the arg (TODO: may need to do more work here) -->
    … …  
    985989      <xsl:when test="@rep = 'norepeat' or not(@rep) or @rep = ''"/>
    986990      <xsl:when test="@rep = 'repeat'">               <xsl:value-of select="$arg.rep.repeat.str"/></xsl:when>
    987       <xsl:otherwise><xsl:message terminate="yes">Invalid rep choice: "<xsl:value-of select="@rep"/>"</xsl:message></xsl:otherwise>
    988     </xsl:choose>
     991      <xsl:otherwise><xsl:message terminate="yes"><xsl:call-template name="error-prefix"/>Invalid rep choice: "<xsl:value-of select="@rep"/>"</xsl:message></xsl:otherwise>
     992    </xsl:choose>
     993
    989994    <!-- close wrapping -->
    990     <xsl:choose>
    991       <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.close.str"/></xsl:when>
    992       <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.close.str"/></xsl:when>
    993       <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.close.str"/></xsl:when>
    994     </xsl:choose>
     995    <xsl:if test="$fWrappers">
     996      <xsl:choose>
     997        <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.close.str"/></xsl:when>
     998        <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.close.str"/></xsl:when>
     999        <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.close.str"/></xsl:when>
     1000      </xsl:choose>
     1001      <!-- Add a space padding if we're the last element in a repeating arg or group -->
     1002      <xsl:if test="(parent::arg or parent::group) and not(following-sibiling)">
     1003        <xsl:text> </xsl:text>
     1004      </xsl:if>
     1005    </xsl:if>
    9951006  </xsl:template>
    9961007

  • TabularUnified trunk/doc/manual/en_US/man_VBoxManage-clonevm.xml

    r77888 r79609  
    4545      <arg rep="repeat">--group=<replaceable>group</replaceable>,</arg>
    4646
    47       <arg>--mode=<group choice='plain'><arg choice='plain'>machine</arg><arg choice='plain'>machinechildren</arg><arg choice='plain'>all</arg></group></arg>
     47      <group choice='opt'>
     48        <arg choice='plain'>--mode=machine</arg>
     49        <arg choice='plain'>--mode=machinechildren</arg>
     50        <arg choice='plain'>--mode=all</arg>
     51      </group>
    4852
    4953      <arg>--name=<replaceable>name</replaceable></arg>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette