townforge/quickbook
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix variablelist bug not accepting paragraphs

Browse Source 
[SVN r38316]
This commit is contained in:
Joel de Guzman 2007-07-31 01:46:12 +00:00
parent c50b62bdb6
commit 7dd1716599
12 changed files with 100 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block.hpp
View File

@ -272,8 +272,8 @@ namespace quickbook
>>
(
(
phrase [actions.end_varlistitem]
>> ch_p(']')
inside_paragraph
>> ch_p(']') [actions.end_varlistitem]
>> space
)
| eps_p [actions.error]

14
detail/actions.cpp
View File

@ -667,6 +667,20 @@ namespace quickbook
actions.table_title.clear();
}
void start_varlistitem_action::operator()(char) const
{
phrase << start_varlistitem_;
phrase.push();
}
void end_varlistitem_action::operator()(char) const
{
std::string str;
temp_para.swap(str);
phrase.pop();
phrase << str << end_varlistitem_;
}
void table_action::operator()(iterator, iterator) const
{
std::string::iterator first = actions.table_title.begin();

21
detail/actions.hpp
View File

@ -479,6 +479,27 @@ namespace quickbook
std::string str;
};
struct start_varlistitem_action
{
start_varlistitem_action(collector& phrase)
: phrase(phrase) {}
void operator()(char) const;
collector& phrase;
};
struct end_varlistitem_action
{
end_varlistitem_action(collector& phrase, collector& temp_para)
: phrase(phrase), temp_para(temp_para) {}
void operator()(char) const;
collector& phrase;
collector& temp_para;
};
struct break_action
{
// Handles line-breaks (DEPRECATED!!!)

4
detail/actions_class.cpp
View File

@ -143,8 +143,8 @@ namespace quickbook
, end_varlistentry(phrase, end_varlistentry_)
, start_varlistterm(phrase, start_varlistterm_)
, end_varlistterm(phrase, end_varlistterm_)
, start_varlistitem(phrase, start_varlistitem_)
, end_varlistitem(phrase, end_varlistitem_)
, start_varlistitem(phrase)
, end_varlistitem(phrase, temp_para)
, break_(phrase)
, macro_identifier(*this)

4
detail/actions_class.hpp
View File

@ -165,8 +165,8 @@ namespace quickbook
markup_action end_varlistentry;
markup_action start_varlistterm;
markup_action end_varlistterm;
markup_action start_varlistitem;
markup_action end_varlistitem;
start_varlistitem_action start_varlistitem;
end_varlistitem_action end_varlistitem;
break_action break_;
macro_identifier_action macro_identifier;

2
doc/html/index.html
View File

@ -70,7 +70,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"><p><small>Last revised: July 29, 2007 at 23:44:40 GMT</small></p></td>
<td align="left"><p><small>Last revised: July 31, 2007 at 01:38:44 GMT</small></p></td>
<td align="right"><small></small></td>
</tr></table>
<hr>

22
doc/html/quickbook/editors/kde_support.html
View File

@ -26,7 +26,7 @@
<div class="titlepage"><div><div><h3 class="title">
<a name="quickbook.editors.kde_support"></a><a href="kde_support.html" title="KDE Support">KDE Support</a></h3></div></div></div>
<a name="quickbook.editors.kde_support.boost__hs__quickbook"></a><h4>
<a name="id466157"></a>
<a name="id466174"></a>
<a href="kde_support.html#quickbook.editors.kde_support.boost__hs__quickbook">boost::hs::quickbook</a>
</h4>
<p>
@ -38,16 +38,20 @@
<p class="title"><b></b></p>
<dl>
<dt><span class="term">.qbk loaded in a text editor</span></dt>
<dd><span class="inlinemediaobject"><img src="../../images/extra/katepart/table.text.editor.png" alt="table.text.editor"></span></dd>
<dd><p>
<span class="inlinemediaobject"><img src="../../images/extra/katepart/table.text.editor.png" alt="table.text.editor"></span>
</p></dd>
<dt><span class="term">.qbk loaded with boost::hs support</span></dt>
<dd><span class="inlinemediaobject"><img src="../../images/extra/katepart/table.boost.hs.png" alt="table.boost.hs"></span></dd>
<dd><p>
<span class="inlinemediaobject"><img src="../../images/extra/katepart/table.boost.hs.png" alt="table.boost.hs"></span>
</p></dd>
</dl>
</div>
<p>
<span class="bold"><b>html generated from this .qbk file</b></span>
</p>
<div class="table">
<a name="id466251"></a><p class="title"><b>Table 7. Code examples</b></p>
<a name="id466276"></a><p class="title"><b>Table 7. Code examples</b></p>
<table class="table" summary="Code examples">
<colgroup>
<col>
@ -136,7 +140,7 @@
</table>
</div>
<a name="quickbook.editors.kde_support.code_folding_"></a><h4>
<a name="id466658"></a>
<a name="id466682"></a>
<a href="kde_support.html#quickbook.editors.kde_support.code_folding_">Code Folding
</a>
</h4>
@ -146,7 +150,7 @@
region can be folded or unfolded independently.
</p>
<a name="quickbook.editors.kde_support.auto_comment___uncomment_"></a><h4>
<a name="id466690"></a>
<a name="id466715"></a>
<a href="kde_support.html#quickbook.editors.kde_support.auto_comment___uncomment_">Auto
Comment / Uncomment </a>
</h4>
@ -157,7 +161,7 @@
while being in it.
</p>
<a name="quickbook.editors.kde_support.styles_reference_"></a><h4>
<a name="id466732"></a>
<a name="id466756"></a>
<a href="kde_support.html#quickbook.editors.kde_support.styles_reference_">Styles reference
</a>
</h4>
@ -394,7 +398,7 @@
</tbody>
</table></div>
<a name="quickbook.editors.kde_support.about_boost__hs"></a><h4>
<a name="id467180"></a>
<a name="id467204"></a>
<a href="kde_support.html#quickbook.editors.kde_support.about_boost__hs">About boost::hs</a>
</h4>
<p>
@ -421,7 +425,7 @@
</td></tr>
</table></div>
<a name="quickbook.editors.kde_support.installing_boost__hs"></a><h4>
<a name="id467252"></a>
<a name="id467276"></a>
<a href="kde_support.html#quickbook.editors.kde_support.installing_boost__hs">Installing
boost::hs</a>
</h4>

2
doc/html/quickbook/faq.html
View File

@ -26,7 +26,7 @@
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="quickbook.faq"></a><a href="faq.html" title=" Frequently Asked Questions"> Frequently Asked Questions</a></h2></div></div></div>
<a name="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"></a><h3>
<a name="id467407"></a>
<a name="id467432"></a>
<a href="faq.html#quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
I use QuickBook for non-Boost documentation?</a>
</h3>

2
doc/html/quickbook/ref.html
View File

@ -28,7 +28,7 @@
[cpp]
</p>
<div class="table">
<a name="id467506"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
<a name="id467530"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
<table class="table" summary="Syntax Compendium">
<colgroup>
<col>

39
doc/html/quickbook/syntax/block.html
View File

@ -876,7 +876,7 @@ sf_logo
</td>
<td>
<p>
2007-Jul-30
2007-Jul-31
</p>
</td>
</tr>
@ -893,7 +893,7 @@ sf_logo
</td>
<td>
<p>
07:44:40 AM
09:38:44 AM
</p>
</td>
</tr>
@ -1528,7 +1528,11 @@ for the journey to old age.]]]
<pre class="programlisting">[variablelist A Variable List
[[term 1] [The definition of term 1]]
[[term 2] [The definition of term 2]]
[[term 3] [The definition of term 3]]
[[term 3] [
The definition of term 3.
Definitions may contain paragraphs.
]]
]
</pre>
<p>
@ -1538,17 +1542,22 @@ for the journey to old age.]]]
<p class="title"><b>A Variable List</b></p>
<dl>
<dt><span class="term">term 1</span></dt>
<dd>
The definition of term 1
</dd>
<dd><p>
The definition of term 1
</p></dd>
<dt><span class="term">term 2</span></dt>
<dd>
The definition of term 2
</dd>
<dd><p>
The definition of term 2
</p></dd>
<dt><span class="term">term 3</span></dt>
<dd>
The definition of term 3
</dd>
<p>
The definition of term 3.
</p>
<p>
Definitions may contain paragraphs.
</p>
</dd>
</dl>
</div>
<p>
@ -1609,7 +1618,7 @@ for the journey to old age.]]]
QuickBook's import facility provides a nice solution.
</p>
<a name="quickbook.syntax.block.import.example"></a><h5>
<a name="id461978"></a>
<a name="id461995"></a>
<a href="block.html#quickbook.syntax.block.import.example">Example</a>
</h5>
<p>
@ -1716,7 +1725,7 @@ for the journey to old age.]]]
<p>
</p>
<a name="quickbook.syntax.block.import.code_snippet_markup"></a><h5>
<a name="id462291"></a>
<a name="id462308"></a>
<a href="block.html#quickbook.syntax.block.import.code_snippet_markup">Code
Snippet Markup</a>
</h5>
@ -1737,7 +1746,7 @@ for the journey to old age.]]]
This too will not be visible in quickbook.
</p>
<a name="quickbook.syntax.block.import.special_comments"></a><h5>
<a name="id462417"></a>
<a name="id462433"></a>
<a href="block.html#quickbook.syntax.block.import.special_comments">Special
Comments</a>
</h5>
@ -1779,7 +1788,7 @@ for the journey to old age.]]]
between the delimeters will simply be ignored.
</p>
<a name="quickbook.syntax.block.import.callouts"></a><h5>
<a name="id462565"></a>
<a name="id462582"></a>
<a href="block.html#quickbook.syntax.block.import.callouts">Callouts</a>
</h5>
<p>

12
doc/quickbook.qbk
View File

@ -1572,7 +1572,11 @@ Here's how to have preformatted blocks of code in a table cell:
[variablelist A Variable List
[[term 1] [The definition of term 1]]
[[term 2] [The definition of term 2]]
[[term 3] [The definition of term 3]]
[[term 3] [
The definition of term 3.
Definitions may contain paragraphs.
]]
]
''']
@ -1581,7 +1585,11 @@ will generate:
[variablelist A Variable List
[[term 1] [The definition of term 1]]
[[term 2] [The definition of term 2]]
[[term 3] [The definition of term 3]]
[[term 3] [
The definition of term 3.
Definitions may contain paragraphs.
]]
]
The rules for variable lists are the same as for tables, except that

12
test/quickbook-manual.gold
View File

@ -2378,15 +2378,21 @@ for the journey to old age.]]]
<variablelist>
<title>A Variable List</title> <varlistentry><term>term 1</term>
<listitem>
The definition of term 1
<para>
The definition of term 1
</para>
</listitem>
</varlistentry> <varlistentry><term>term 2</term>
<listitem>
The definition of term 2
<para>
The definition of term 2
</para>
</listitem>
</varlistentry> <varlistentry><term>term 3</term>
<listitem>
The definition of term 3
<para>
The definition of term 3
</para>
</listitem>
</varlistentry>
</variablelist>