From cb60973a8d7335f4decc5cc7acdbb5a1c1a98981 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 22 May 2022 13:21:57 -0400 Subject: [PATCH 01/51] Join lines in paragraph Signed-off-by: Roger Sheen --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1c8232b0..9f71309a 100644 --- a/README.md +++ b/README.md @@ -94,8 +94,7 @@ The plug-in extends the standard HTML5 table of contents (ToC) [navigation param By default, the plug-in uses the `partial` option to include the current topic in the ToC along with its parents, siblings and children. As with the default HTML5 plug-in, the `full` option can also be used to generate a complete ToC for the entire map, or `none` to disable the table of contents entirely. -As of version 5.3.1, the plug-in provides five new options to style the table of contents navigation with the Bootstrap [list group][7] component , [nav][16] component -and [collapsible][17] menus +As of version 5.3.1, the plug-in provides five new options to style the table of contents navigation with the Bootstrap [list group][7] component , [nav][16] component and [collapsible][17] menus: - `list-group-full` – Styled full ToC within a Bootstrap list group - `list-group-partial` – Partial ToC with the current topic, parents, siblings, and children in a list group From cf1e0277feeb7266061c01c78c37ac26fc4fa64f Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 22 May 2022 13:43:40 -0400 Subject: [PATCH 02/51] Fix Popover docs reference Signed-off-by: Roger Sheen --- Customization/xsl/popovers.xsl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Customization/xsl/popovers.xsl b/Customization/xsl/popovers.xsl index 6e11e8d7..25ac592d 100644 --- a/Customization/xsl/popovers.xsl +++ b/Customization/xsl/popovers.xsl @@ -11,9 +11,8 @@ version="2.0" exclude-result-prefixes="xs xhtml dita-ot" > - - - + + From bb569d85b19ff64e577edc969f473ec8e09c060f Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 22 May 2022 13:44:43 -0400 Subject: [PATCH 03/51] Fix indentation Signed-off-by: Roger Sheen --- Customization/xsl/popovers.xsl | 6 +--- Customization/xsl/tooltips.xsl | 54 ++++++++++++++++------------------ 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/Customization/xsl/popovers.xsl b/Customization/xsl/popovers.xsl index 25ac592d..85fc1d33 100644 --- a/Customization/xsl/popovers.xsl +++ b/Customization/xsl/popovers.xsl @@ -14,7 +14,7 @@ - + popover @@ -34,18 +34,14 @@ - - - - diff --git a/Customization/xsl/tooltips.xsl b/Customization/xsl/tooltips.xsl index 4e1fc9d6..6e1cb89e 100644 --- a/Customization/xsl/tooltips.xsl +++ b/Customization/xsl/tooltips.xsl @@ -11,11 +11,10 @@ version="2.0" exclude-result-prefixes="xs xhtml dita-ot" > - + - - + tooltip @@ -35,7 +34,6 @@ - @@ -51,48 +49,46 @@ - - - + + - + - - - - + + + + - < - - > - - </ - - > - - - /> - + + > + + </ + + > + + + /> + - - - =" - - " + + + =" + + " - + From c45af88b496b0b04d483938b5dc9a1893e684dc3 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 22 May 2022 14:02:46 -0400 Subject: [PATCH 04/51] Align options in CLI examples Signed-off-by: Roger Sheen --- sample/breadcrumb.dita | 10 +++++----- sample/index.dita | 18 +++++++++--------- sample/scrollspy.dita | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sample/breadcrumb.dita b/sample/breadcrumb.dita index d7156cda..2c9f1fa0 100644 --- a/sample/breadcrumb.dita +++ b/sample/breadcrumb.dita @@ -31,8 +31,8 @@

dita --input=path/to/your.ditamap \ - --format= \ - --args.breadcrumbs= + --format= \ + --args.breadcrumbs=
Dividers @@ -41,9 +41,9 @@ dita --input=path/to/your.ditamap \ - --format= \ - --args.breadcrumbs= \ - --bootstrap.breadcrumb.divider= + --format= \ + --args.breadcrumbs= \ + --bootstrap.breadcrumb.divider=
diff --git a/sample/index.dita b/sample/index.dita index 703225cd..f2102f31 100644 --- a/sample/index.dita +++ b/sample/index.dita @@ -199,9 +199,9 @@ dita command:

dita --input=path/to/your.ditamap \ - --format= \ - --nav-toc= \ - --menubar-toc.include= + --format= \ + --nav-toc= \ + --menubar-toc.include= @@ -225,12 +225,12 @@ command via the --args.css parameter:

dita --input=path/to/your.ditamap \ - --format= \ - --args.hdr=path/to/your-header.xml \ - --args.css=<name-of-css>.css \ - --args.copycss= \ - --args.csspath= - --args.cssroot=path/to/your/theme + --format= \ + --args.hdr=path/to/your-header.xml \ + --args.css=<name-of-css>.css \ + --args.copycss= \ + --args.csspath= + --args.cssroot=path/to/your/theme

For more extensive customizations, you may want to fork this repository and create a new plug-in of your own.

diff --git a/sample/scrollspy.dita b/sample/scrollspy.dita index f1b8a1d5..e78c57ca 100644 --- a/sample/scrollspy.dita +++ b/sample/scrollspy.dita @@ -57,9 +57,9 @@ --nav-toc= to the dita command.

dita --input=path/to/your.ditamap \ - --format= \ - --nav-toc= \ - --menubar-toc.include= + --format= \ + --nav-toc= \ + --menubar-toc.include=
Example with list-group @@ -89,9 +89,9 @@ command.

dita --input=path/to/your.ditamap \ - --format= \ - --nav-toc= \ - --menubar-toc.include= + --format= \ + --nav-toc= \ + --menubar-toc.include=
From eb3affae98a773a8c05764d244e3f3f08505366f Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Thu, 21 Jul 2022 21:06:30 +0200 Subject: [PATCH 05/51] Update to Bootstrap 5.2 --- .github/dita-ot/header.xml | 2 +- Customization/xsl/accordion.xsl | 2 +- Customization/xsl/breadcrumb.xsl | 2 +- Customization/xsl/card.xsl | 2 +- Customization/xsl/carousel.xsl | 2 +- Customization/xsl/collapse.xsl | 2 +- Customization/xsl/nav.xsl | 8 ++++---- Customization/xsl/offcanvas.xsl | 2 +- Customization/xsl/pagination.xsl | 2 +- Customization/xsl/popovers.xsl | 2 +- Customization/xsl/scrollspy.xsl | 2 +- Customization/xsl/tabs.xsl | 6 +++--- Customization/xsl/tooltips.xsl | 2 +- Customization/xsl/topic.xsl | 8 ++++---- README.md | 12 ++++++------ includes/bootstrap.hdf.xml | 8 ++++---- sample/accordion.dita | 6 +++--- sample/alerts.dita | 4 ++-- sample/badge.dita | 4 ++-- sample/breadcrumb.dita | 4 ++-- sample/button-group.dita | 4 ++-- sample/buttons.dita | 4 ++-- sample/card.dita | 8 ++++---- sample/carousel.dita | 4 ++-- sample/collapse.dita | 4 ++-- sample/figures.dita | 2 +- sample/grid.dita | 4 ++-- sample/icons.dita | 4 ++-- sample/images.dita | 6 +++--- sample/index.dita | 26 +++++++++++++------------- sample/list-group.dita | 4 ++-- sample/offcanvas.dita | 4 ++-- sample/pagination.dita | 6 +++--- sample/popovers.dita | 4 ++-- sample/scrollspy.dita | 2 +- sample/tables.dita | 4 ++-- sample/tabs.dita | 4 ++-- sample/tooltips.dita | 4 ++-- sample/typography.dita | 2 +- sample/utilities.dita | 4 ++-- 40 files changed, 93 insertions(+), 93 deletions(-) diff --git a/.github/dita-ot/header.xml b/.github/dita-ot/header.xml index f9858cbd..ac849df4 100644 --- a/.github/dita-ot/header.xml +++ b/.github/dita-ot/header.xml @@ -53,7 +53,7 @@
  • Bootstrap Docs
    • diff --git a/Customization/xsl/accordion.xsl b/Customization/xsl/accordion.xsl index e5af5f1b..f23788c5 100644 --- a/Customization/xsl/accordion.xsl +++ b/Customization/xsl/accordion.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs xhtml dita-ot" > - +
    diff --git a/Customization/xsl/breadcrumb.xsl b/Customization/xsl/breadcrumb.xsl index 6b6e7efb..3211c958 100644 --- a/Customization/xsl/breadcrumb.xsl +++ b/Customization/xsl/breadcrumb.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs dita-ot ditamsg" > - + diff --git a/Customization/xsl/card.xsl b/Customization/xsl/card.xsl index 5b918cb3..8c950e1d 100644 --- a/Customization/xsl/card.xsl +++ b/Customization/xsl/card.xsl @@ -12,7 +12,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > - +
    diff --git a/Customization/xsl/carousel.xsl b/Customization/xsl/carousel.xsl index 64c1544c..4f92f5f8 100644 --- a/Customization/xsl/carousel.xsl +++ b/Customization/xsl/carousel.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs xhtml dita-ot" > - + - + diff --git a/Customization/xsl/nav.xsl b/Customization/xsl/nav.xsl index bba4a6c7..5347eac7 100644 --- a/Customization/xsl/nav.xsl +++ b/Customization/xsl/nav.xsl @@ -202,7 +202,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + diff --git a/Customization/xsl/offcanvas.xsl b/Customization/xsl/offcanvas.xsl index eca50742..70c7ff0c 100644 --- a/Customization/xsl/offcanvas.xsl +++ b/Customization/xsl/offcanvas.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs xhtml dita-ot" > - + diff --git a/Customization/xsl/pagination.xsl b/Customization/xsl/pagination.xsl index a62e8f46..6169898c 100644 --- a/Customization/xsl/pagination.xsl +++ b/Customization/xsl/pagination.xsl @@ -12,7 +12,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > - + - + diff --git a/Customization/xsl/scrollspy.xsl b/Customization/xsl/scrollspy.xsl index dbdf5151..41d4a278 100644 --- a/Customization/xsl/scrollspy.xsl +++ b/Customization/xsl/scrollspy.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs xhtml dita-ot" > - + diff --git a/Customization/xsl/tabs.xsl b/Customization/xsl/tabs.xsl index 0bd8db96..6795fc6a 100644 --- a/Customization/xsl/tabs.xsl +++ b/Customization/xsl/tabs.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs xhtml dita-ot" > - +
      @@ -29,12 +29,12 @@ - + - +
      diff --git a/Customization/xsl/tooltips.xsl b/Customization/xsl/tooltips.xsl index 6e1cb89e..0ac3f4ba 100644 --- a/Customization/xsl/tooltips.xsl +++ b/Customization/xsl/tooltips.xsl @@ -12,7 +12,7 @@ exclude-result-prefixes="xs xhtml dita-ot" > - + diff --git a/Customization/xsl/topic.xsl b/Customization/xsl/topic.xsl index 2c632d05..b1e917c7 100644 --- a/Customization/xsl/topic.xsl +++ b/Customization/xsl/topic.xsl @@ -113,7 +113,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -299,7 +299,7 @@ - + diff --git a/README.md b/README.md index 9f71309a..f5f947c2 100644 --- a/README.md +++ b/README.md @@ -196,15 +196,15 @@ Breadcrumbs and menu bars can be added using the following parameters [Apache 2.0](LICENSE) © 2017–2022 Roger W. Fienhold Sheen -Within the sample documentation, where necessary, the texts describing the usage of each component have been copied directly from the official [Bootstrap 5.1 documentation][2], however DITA markup is used throughout the examples describing how to implement these components correctly using `outputclass`. The text is therefore a derivative of "Bootstrap 5.1 docs" by Twitter, Inc. and the Bootstrap Authors, and used under CC BY 3.0. +Within the sample documentation, where necessary, the texts describing the usage of each component have been copied directly from the official [Bootstrap 5.2 documentation][2], however DITA markup is used throughout the examples describing how to implement these components correctly using `outputclass`. The text is therefore a derivative of "Bootstrap 5.2 docs" by Twitter, Inc. and the Bootstrap Authors, and used under CC BY 3.0. [1]: http://www.dita-ot.org -[2]: https://getbootstrap.com/docs/5.1 -[3]: https://getbootstrap.com/docs/5.1/examples/navbars/ +[2]: https://getbootstrap.com/docs/5.2 +[3]: https://getbootstrap.com/docs/5.2/examples/navbars/ [4]: ./includes/bs-navbar-light.hdr.xml [5]: ./includes/bs-footer-example.xml [6]: https://www.dita-ot.org/dev/parameters/parameters-html5.html#html5__nav-toc -[7]: https://getbootstrap.com/docs/5.1/components/list-group/ +[7]: https://getbootstrap.com/docs/5.2/components/list-group/ [8]: https://infotexture.github.io/dita-bootstrap [9]: https://themestr.app/theme [10]: ./css/custom.css @@ -213,5 +213,5 @@ Within the sample documentation, where necessary, the texts describing the usage [13]: https://twitter.com/infotexture [14]: https://github.com/infotexture/dita-bootstrap/issues/new [15]: https://help.github.com/articles/using-pull-requests/ -[16]: https://getbootstrap.com/docs/5.1/components/navs-tabs/#pills -[17]: https://getbootstrap.com/docs/5.1/components/collapse/ +[16]: https://getbootstrap.com/docs/5.2/components/navs-tabs/#pills +[17]: https://getbootstrap.com/docs/5.2/components/collapse/ diff --git a/includes/bootstrap.hdf.xml b/includes/bootstrap.hdf.xml index 7c7fb618..9efea258 100644 --- a/includes/bootstrap.hdf.xml +++ b/includes/bootstrap.hdf.xml @@ -1,13 +1,13 @@