Skip to content

Commit 56e0be4

Browse files
committed
Revert "Doc: Modify \tabcontent..\endtabcontent macros"
This reverts commit 5c0b08a. After the original commit, DocBook support for tabbed content was introduced (as format-specific macros). This means that the original macros will also have to be HTML-format specific, as macros cannot have both default and format-specific variants defined. In addition to reverting, add linefeeds to (end)tabcontent.HTML macros to solve the same problem that the reverted commit did. In passing, fix an issue with the tabcontent.DocBook macro; it takes a single argument, therefore the placeholder for the value must be \1. Change-Id: I90ed6bc37d70c10754b3b810198ac44fcd189766 Reviewed-by: Paul Wicking <[email protected]> Reviewed-by: David Boddie <[email protected]>
1 parent 3982de7 commit 56e0be4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

doc/global/htmltabs.qdocconf

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
# \endtabcontent
3939
# \endif
4040

41-
macro.tab.HTML = "<input type=\"radio\" name=\"tabs_\1\" id=\"\2\" \4/><label for=\"\2\">\3</label>\n<style>#\2:checked ~ .\2{display: block;}</style>\n"
42-
macro.tabcontent = "\\div {class=\"tabcontent \1\"}"
43-
macro.endtabcontent = "\\enddiv"
41+
macro.tab.HTML = "<input type=\"radio\" name=\"tabs_\1\" id=\"\2\" \4/><label for=\"\2\">\3</label><style>#\2:checked ~ .\2{display: block;}</style>"
42+
macro.tabcontent.HTML = "<div class=\"tabcontent \1\">\n"
43+
macro.endtabcontent.HTML = "</div>\n"
4444

4545
macro.tab.DocBook = "<db:bridgehead xml:id="\2" renderas="sect5" role="tabbed \4 tab-group_\1" xlink:href="#\2_contents">\3</db:bridgehead>"
46-
macro.tabcontent.DocBook = "<db:sidebar xml:id="\2_contents">"
46+
macro.tabcontent.DocBook = "<db:sidebar xml:id="\1_contents">"
4747
macro.endtabcontent.DocBook = "</db:sidebar>"
4848

4949
HTML.extraimages += template/style/htmltabs.css

0 commit comments

Comments
 (0)