From 625ed322c29fc84b6f1352bf5c6db5b3058e81da Mon Sep 17 00:00:00 2001
From: chrispy <chrispy@synopsys.com>
Date: Thu, 27 Apr 2023 08:18:20 -0400
Subject: [PATCH] wrap <note> body content in <div class="note__body">

Signed-off-by: chrispy <chrispy@synopsys.com>
---
 src/main/plugins/org.dita.html5/sass/_notes.scss |  4 ++++
 src/main/plugins/org.dita.html5/xsl/topic.xsl    | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/plugins/org.dita.html5/sass/_notes.scss b/src/main/plugins/org.dita.html5/sass/_notes.scss
index f4b3d963b4..86b76c65b3 100644
--- a/src/main/plugins/org.dita.html5/sass/_notes.scss
+++ b/src/main/plugins/org.dita.html5/sass/_notes.scss
@@ -20,4 +20,8 @@
   .notelisttitle {
     @extend .notetitle;
   }
+
+  .note__body {
+    display: inline;
+  }
 }
diff --git a/src/main/plugins/org.dita.html5/xsl/topic.xsl b/src/main/plugins/org.dita.html5/xsl/topic.xsl
index 616da29dd0..3e9196ac05 100644
--- a/src/main/plugins/org.dita.html5/xsl/topic.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/topic.xsl
@@ -2835,7 +2835,7 @@ See the accompanying LICENSE file for applicable license.
         <xsl:with-param name="default-output-class" select="string-join(($type, concat('note_', $type)), ' ')"/>
       </xsl:call-template>
       <xsl:call-template name="setidaname"/>
-      <!-- Normal flags go before the generated title; revision flags only go on the content. -->
+      <!-- Normal flags go around the entire note (including before the generated title) -->
       <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]/prop" mode="ditaval-outputflag"/>
       <span class="note__title">
         <xsl:copy-of select="$title"/>
@@ -2844,10 +2844,13 @@ See the accompanying LICENSE file for applicable license.
         </xsl:call-template>
       </span>
       <xsl:text> </xsl:text>
-      <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]/revprop" mode="ditaval-outputflag"/>
-      <xsl:apply-templates/>
-      <!-- Normal end flags and revision end flags both go out after the content. -->
-      <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]" mode="out-of-line"/>
+      <div class="note__body">
+        <!-- Revision flags go around only the content -->
+        <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]/revprop" mode="ditaval-outputflag"/>
+        <xsl:apply-templates/>
+        <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]/revprop" mode="ditaval-outputflag"/>
+      </div>
+      <xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]/prop" mode="ditaval-outputflag"/>
     </div>
   </xsl:template>