Merge branch 'release/5.3.2'

* release/5.3.2: (51 commits) move common attributes logic Add TODO comment on mode changes Update annotation comments Restore original DITA-OT indentation to quiet diff Re-run Prettier Update & install dependencies to fix commit hooks Fix broken link IDs Copyedit RTL topic & update navtitle Bump plug-in version to 5.3.2 Fix arrow direction in annotation comments Fix indentation Correct `<codeph>` to `<option>` Update Customization/xsl/topic.xsl Move RTL to layout. Update build_dita2html5-bootstrap.xml Update plugin.xml Update plugin.xml Move direction from main to article Run prettier Document RTL support ...
infotexture · Sep 21, 2022 · f7eccab · f7eccab
2 parents ee9ca41 + 7010100
commit f7eccab
Show file tree

Hide file tree

Showing 55 changed files with 7,748 additions and 5,293 deletions.
diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml
@@ -53,7 +53,7 @@
         <li class="nav-item">
           <a
             class="nav-link"
-            href="https://getbootstrap.com/docs/5.1"
+            href="https://getbootstrap.com/docs/5.2"
           >Bootstrap Docs</a>
         </li>
       </ul>

diff --git a/.github/dita-ot/theme.css b/.github/dita-ot/theme.css
@@ -21,3 +21,16 @@ footer {
   margin: 1rem -0.75rem 0;
   border: solid #dee2e6 1px;
 }
+
+.custom-popover {
+  --bs-popover-max-width: 200px;
+  --bs-popover-border-color: var(--bs-primary);
+  --bs-popover-header-bg: var(--bs-primary);
+  --bs-popover-header-color: var(--bs-white);
+  --bs-popover-body-padding-x: 1rem;
+  --bs-popover-body-padding-y: 0.5rem;
+}
+
+.custom-tooltip {
+  --bs-tooltip-bg: var(--bs-primary);
+}
diff --git a/Customization/xsl/accordion.xsl b/Customization/xsl/accordion.xsl
@@ -12,7 +12,7 @@
   exclude-result-prefixes="xs xhtml dita-ot"
 >
   <!-- Customization to add Bootstrap Accordion Component -->
-  <!-- https://getbootstrap.com/docs/5.1/components/accordion/ -->
+  <!-- https://getbootstrap.com/docs/5.2/components/accordion/ -->
 
   <xsl:template match="*[contains(@class,' topic/bodydiv ') and contains(@outputclass, 'accordion')]">
     <div>

diff --git a/Customization/xsl/breadcrumb.xsl b/Customization/xsl/breadcrumb.xsl
@@ -12,7 +12,7 @@
   exclude-result-prefixes="xs dita-ot ditamsg"
 >
   <!-- Override to add Bootstrap breadcrumb component -->
-  <!-- https://getbootstrap.com/docs/5.1/components/breadcrumb/ -->
+  <!-- https://getbootstrap.com/docs/5.2/components/breadcrumb/ -->
 
   <!-- Whether include a bootstrap breadcrumb component on each page.  values are 'yes' or 'no' -->
   <xsl:param name="BREADCRUMBS" select="'no'"/>
@@ -21,10 +21,9 @@
 
   <!-- Add Bootstrap breadcrumb -->
   <xsl:template match="*" mode="gen-user-breadcrumb">
-
     <nav aria-label="breadcrumb">
       <xsl:if test="not($BREADCRUMB_DIVIDER = '/')">
-         <xsl:attribute name="style">
+        <xsl:attribute name="style">
           <xsl:text>--bs-breadcrumb-divider: '</xsl:text>
           <xsl:value-of select="$BREADCRUMB_DIVIDER"/>
           <xsl:text>';</xsl:text>
@@ -94,6 +93,4 @@
       </ol>
     </nav>
   </xsl:template>
-
-
 </xsl:stylesheet>
diff --git a/Customization/xsl/card.xsl b/Customization/xsl/card.xsl
@@ -12,7 +12,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 >
   <!-- Customization to add Bootstrap Card Component -->
-  <!-- https://getbootstrap.com/docs/5.1/components/card/ -->
+  <!-- https://getbootstrap.com/docs/5.2/components/card/ -->
 
   <xsl:template match="*[contains(@class,' topic/section ') and contains(@outputclass, 'card')]">
     <div>

diff --git a/Customization/xsl/carousel.xsl b/Customization/xsl/carousel.xsl
@@ -12,7 +12,7 @@
   exclude-result-prefixes="xs xhtml dita-ot"
 >
   <!-- Customization to add Bootstrap Carousel Component -->
-  <!-- https://getbootstrap.com/docs/5.1/components/carousel/ -->
+  <!-- https://getbootstrap.com/docs/5.2/components/carousel/ -->
 
   <xsl:template
     match="*[ (contains(@class,' topic/ul ') or contains(@class, ' topic/ol ')) and contains(@outputclass, 'carousel')]"

diff --git a/Customization/xsl/collapse.xsl b/Customization/xsl/collapse.xsl
@@ -12,10 +12,10 @@
   exclude-result-prefixes="xs xhtml dita-ot"
 >
   <!-- Customization to add Bootstrap Collapse Component -->
-  <!-- https://getbootstrap.com/docs/5.1/components/collapse/ -->
+  <!-- https://getbootstrap.com/docs/5.2/components/collapse/ -->
 
   <xsl:template match="*[contains(@class,' topic/bodydiv ') and contains(@outputclass, 'collapse-horizontal')]">
-    <xsl:variable name="id" select="dita-ot:generate-html-id(.)"/>
+    <xsl:variable name="id" select="if(@id) then dita-ot:generate-html-id(.) else generate-id(.)"/>
     <div>
       <xsl:if test="contains(@otherprops, 'style(')">
         <xsl:attribute name="style">
@@ -65,11 +65,10 @@
     </div>
   </xsl:template>
 
-
   <!-- Override to connect an collapsed element to a button -->
   <xsl:template match="*[contains(@class,' topic/xref ') and contains(@props, 'collapse-toggle')]">
-    <xsl:variable name="href" select="replace(@href, '#', '')"/>
-    <xsl:variable name="id" select="dita-ot:generate-html-id(//*[@id=$href])"/>
+    <xsl:variable name="href" select="substring-after(@href, '#')"/>
+    <xsl:variable name="id" select="if(//*[@id=$href]) then dita-ot:generate-html-id(//*[@id=$href]) else generate-id(//*[@id=$href])"/>
 
     <a data-bs-toggle="collapse">
       <xsl:call-template name="commonattributes"/>