Uploaded image for project: 'Confluence'
  1. Confluence
  2. CONFLUENCE-368

Macros inside list and task body tags are always imported as inline

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Major
    • 9.74.0
    • 9.71.0
    • Syntax - XHTML
    • None
    • Unknown

    Description

      Content such as this

       

      <ul>
          <li>
          <p>Add a RACF resource in the SERVAUTH class as follows:</p>
          <ac:structured-macro ac:name="code" ac:schema-version="1"
              ac:macro-id="f96ac0fc-1fb2-4f02-8494-f64d1bd3e2cc">
              <ac:parameter ac:name="language">text</ac:parameter>
              <ac:plain-text-body><![CDATA[EZB.NETMGMT.sysname.tcpprocname.SYSTCPCN EZB.NETMGMT.sysname.tcpprocname.SYSTCPSM EZB.NETMGMT.sysname.tcpprocname.SYSTCPOT]]></ac:plain-text-body>
          </ac:structured-macro>
          <p>where:</p>
          </li>
      </ul>

      Trimmed as

       

      <ul>
        <li>
          <p>Something</p>
          <ac:structured-macro ac:name="macroName" />
          <p>Something</p>
        </li>
      </ul>
      

      Will be imported as

       

       

      * (((
      Something
      
      {{macroName/}}Something
      ))) 

      Expected

      * (((
      Something
      
      {{macroName/}}
      
      Something
      ))) 

      This is caused by the line: https://github.com/xwiki-contrib/confluence/blob/514b45ed410f769bd61ab15dbbd201c91f5a1139/confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/MacroTagHandler.java#L112

      Im not sure how we could fix this, since content such as this

      <ul>
        <li>
          Something
          <ac:structured-macro ac:name="macroName" />
          Something
        </li>
      </ul>
       

      Should indeed mark the macro as inline. However, im not sure how often we encounter each scenario.

       

       

       

      Attachments

        Issue Links

          Activity

            People

              rjakse Raphaël Jakse
              tcaras Teodor Caras
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: