Disallow paragraph/list markup in phrase templates.

Can still use block tags.

[SVN r85128]

src/main_grammar.cpp

@@ -101,7 +101,7 @@ namespace quickbook
         // Local members
 
         cl::rule<scanner>
-                        phrase_into_blocks, top_level, indent_check,
+                        template_phrase, top_level, indent_check,
                         paragraph_separator, inside_paragraph,
                         code, code_line, blank_line, hr,
                         inline_code, skip_inline_code,
@@ -383,7 +383,7 @@ namespace quickbook
         inline_phrase =
             state.values.save()
             [   qbk_ver(107u)
-            >>  local.phrase_into_blocks
+            >>  local.template_phrase
             |   qbk_ver(0, 107u)
             >>  scoped_context(element_info::in_phrase)
                 [*local.common]
@@ -407,18 +407,15 @@ namespace quickbook
             ]
             ;
 
-        // Phrase content, that might turn out to be block content.
-        local.phrase_into_blocks =
+        // Phrase templates can contain block tags, but can't contain
+        // syntatic blocks.
+        local.template_phrase =
                 scoped_context(element_info::in_top_level)
-                [   scoped_still_in_block(true)
-                    [   *(  cl::eps_p(ph::var(local.still_in_block))
-                        >>  local.syntactic_block_item(element_info::is_block)
-                        )
-                    >>  !cl::eps_p(!ph::var(local.still_in_block))
-                                        [paragraph_action]
-                    ]
+                [   *(  (local.paragraph_separator >> space >> cl::anychar_p)
+                                        [error("Paragraph in phrase template.")]
+                    |   local.common
+                    )
                 ]
-            >>  block_start
             ;
 
         // Top level blocks

test/Jamfile.v2

@@ -109,6 +109,7 @@ test-suite quickbook.test :
     [ quickbook-test templates-1_5 ]
     [ quickbook-test templates-1_6 ]
     [ quickbook-test templates-1_7 ]
+    [ quickbook-error-test templates-1_7-fail1 ]
     [ quickbook-test unicode_escape-1_5 ]
     [ quickbook-test unmatched_element-1_5 ]
     [ quickbook-test unmatched_element-1_6 ]

test/templates-1_7-fail1.quickbook

@@ -0,0 +1,12 @@
+[article Template 1.7 fail
+[quickbook 1.7]
+]
+
+[/ This should fail because it's a phrase template containing a paragraph
+   separator. ]
+
+[template fail[] Phrase content.
+
+Paragraph content.]
+
+[fail]

test/templates-1_7.gold

@@ -285,12 +285,8 @@
         </tbody>
       </tgroup>
     </informaltable>
-    <itemizedlist>
-      <listitem>
-        <simpara>
-          A list
-        </simpara>
-      </listitem>
-    </itemizedlist>
+    <para>
+      * Not a list
+    </para>
   </section>
 </article>

test/templates-1_7.quickbook

@@ -286,7 +286,7 @@ A <emphasis>paragraph</emphasis>.
 [template phrase_block4[] Text4 before [table] Text4 afterwards]
 [template phrase_block5[] [table] * Not a list]
 [template phrase_block6[] [table]
-* A list]
+* Not a list]
 
 [phrase_block1][phrase_block2][phrase_block3][phrase_block4]
 [phrase_block5][phrase_block6]