Skip to content

Commit f627c79

Browse files
committed
Quickbook: Add 'block' element.
[SVN r75259]
1 parent 5530f14 commit f627c79

File tree

8 files changed

+23
-1
lines changed

8 files changed

+23
-1
lines changed

src/actions.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ namespace quickbook
124124
case block_tags::important:
125125
case block_tags::note:
126126
case block_tags::tip:
127+
case block_tags::block:
127128
return block_action(actions,v);
128129
case block_tags::hr:
129130
return block_empty_action(actions,v);

src/block_element_grammar.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ namespace quickbook
101101
("tip", element_info(element_info::nested_block, &local.inner_block, block_tags::tip))
102102
;
103103

104+
elements.add
105+
("block", element_info(element_info::nested_block, &local.inner_phrase, block_tags::block, 106u))
106+
;
107+
104108
elements.add
105109
("pre", element_info(element_info::nested_block, &local.preformatted, block_tags::preformatted))
106110
;

src/block_tags.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace quickbook
1818
(generic_heading)
1919
(heading1)(heading2)(heading3)(heading4)(heading5)(heading6)
2020
(blurb)(blockquote)(preformatted)
21-
(warning)(caution)(important)(note)(tip)
21+
(warning)(caution)(important)(note)(tip)(block)
2222
(macro_definition)(template_definition)
2323
(variable_list)(table)
2424
(xinclude)(import)(include)

src/markups.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace quickbook
3434
{ block_tags::important, "<important>", "</important>" },
3535
{ block_tags::note, "<note>", "</note>" },
3636
{ block_tags::tip, "<tip>", "</tip>" },
37+
{ block_tags::block, "", "" },
3738
{ block_tags::ordered_list, "<orderedlist>", "</orderedlist>" },
3839
{ block_tags::itemized_list, "<itemizedlist>", "</itemizedlist>" },
3940
{ block_tags::hr, "<para/>", 0 },

test/elements-1_5.gold

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@
99
<para>
1010
[itemized_list [item1][item2]]
1111
</para>
12+
<para>
13+
[block<simplesect><title>A <emphasis role="bold">simplesect</emphasis>!</title>]
14+
</para>
15+
<para>
16+
[block</simplesect>]
17+
</para>
1218
</article>

test/elements-1_5.quickbook

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@
77
[ordered_list [item1][item2]]
88

99
[itemized_list [item1][item2]]
10+
11+
[block'''<simplesect><title>'''A *simplesect*!'''</title>''']
12+
13+
[block'''</simplesect>''']

test/elements-1_6.gold

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@
2727
</para>
2828
</listitem>
2929
</itemizedlist>
30+
<simplesect><title>A <emphasis role="bold">simplesect</emphasis>!</title></simplesect>
31+
3032
</article>

test/elements-1_6.quickbook

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@
77
[ordered_list [item1][item2]]
88

99
[itemized_list [item1][item2]]
10+
11+
[block'''<simplesect><title>'''A *simplesect*!'''</title>''']
12+
13+
[block'''</simplesect>''']

0 commit comments

Comments
 (0)