diff --git a/www/documentation/generated.html b/www/documentation/generated.html
index 3789ca3..2086208 100644
--- a/www/documentation/generated.html
+++ b/www/documentation/generated.html
@@ -84,7 +84,7 @@
 <section xmlns:x="http://www.daisy.org/ns/pipeline/xproc/test" xmlns:f="http://www.daisy.org/ns/pipeline/xproc/test/internal-functions" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 <h2>Definitions</h2>
 <section id="the-description-element">
-<h2>The <code>description</code> element</h2><dl class="element"><dt>Content model:</dt><dd><a href="#the-import-element"><code>import</code></a><small title="zero or more">*</small></dd><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-description-pending"><code>pending</code></a><small title="optional">?</small></dd><dd><a href="#attr-description-script"><code>script</code></a></dd><dd><a href="#attr-description-version"><code>version</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h2>The <code>description</code> element</h2><dl class="element"><dt>Content model:</dt><dd><a href="#the-script-element"><code>script</code></a><small title="optional">?</small></dd><dd><a href="#the-import-element"><code>import</code></a><small title="zero or more">*</small></dd><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-description-pending"><code>pending</code></a><small title="optional">?</small></dd><dd><a href="#attr-description-script"><code>script</code></a><small title="optional">?</small></dd><dd><a href="#attr-description-version"><code>version</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>The <a href="#the-description-element"><code>description</code></a> element is the root element of an xprocspec test and describes the functionality of a specific XProc script.</p>
 
 <p id="attr-description-pending">Assertions or scenarios with the <a href="#attr-description-pending"><code>pending</code></a> attribute will remain untested, but will be
@@ -95,6 +95,18 @@ <h2>The <code>description</code> element</h2><dl class="element"><dt>Content mod
 <p id="attr-description-version">The <a href="#attr-description-version"><code>version</code></a> attribute can be used to aid development over time.</p>
 </section>
 
+<section id="the-script-element">
+<h2>The <code>script</code> element</h2><dl class="element"><dt>Content model:</dt><dd><a href="#the-declare-step-element"><code>declare-step</code></a><small title="optional">?</small></dd><dd><a href="#the-pipeline-element"><code>pipeline</code></a><small title="optional">?</small></dd><dd><a href="#the-library-element"><code>library</code></a><small title="optional">?</small></dd><dt>Content attributes:</dt><dd>None.</dd></dl>
+<p>The script element can be used insted of the <a href="#attr-script-script"><code>script</code></a> attribute.
+                It allows you to inline the XProc script to test.
+                The base URI of the script is the same as the containing xprocspec document,
+                unless otherwise specified using <code>xml:base</code>. One of the <code id="the-declare-step-element">p:declare-step</code>,
+                <code id="the-pipeline-element">p:pipeline</code> or <code id="the-library-element">p:library</code> elements must be used.</p>
+
+</section>
+
+
+
 <section id="the-import-element">
 <h2>The <code>import</code> element</h2><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-import-href"><code>href</code></a></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>
diff --git a/www/documentation/index.html b/www/documentation/index.html
index ba81009..b805d54 100644
--- a/www/documentation/index.html
+++ b/www/documentation/index.html
@@ -187,7 +187,7 @@ <h1 class="title p-name" id="title" property="dcterms:title">xprocspec</h1>
   
     <h2 property="bibo:subtitle" id="subtitle">A tool for testing XProc scripts</h2>
   
-  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-09T08:37:41.000Z" id="unofficial-draft-09-may-2014">Unofficial Draft <time class="dt-published" datetime="2014-05-09">09 May 2014</time></h2>
+  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-09T13:05:54.000Z" id="unofficial-draft-09-may-2014">Unofficial Draft <time class="dt-published" datetime="2014-05-09">09 May 2014</time></h2>
   <dl>
     
     
@@ -233,12 +233,12 @@ <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-09T08:37:
     </p>
     
   
-</section><section id="toc"><h2 class="introductory" aria-level="1" role="heading" id="h2_toc">Table of Contents</h2><ul class="toc" role="directory" id="respecContents"><li class="tocline"><a href="#definitions" class="tocxref"><span class="secno">1. </span>Definitions</a><ul class="toc"><li class="tocline"><a href="#the-description-element" class="tocxref"><span class="secno">1.1 </span>The <code>description</code> element</a></li><li class="tocline"><a href="#the-import-element" class="tocxref"><span class="secno">1.2 </span>The <code>import</code> element</a></li><li class="tocline"><a href="#the-scenario-element" class="tocxref"><span class="secno">1.3 </span>The <code>scenario</code> element</a></li><li class="tocline"><a href="#the-call-element" class="tocxref"><span class="secno">1.4 </span>The <code>call</code> element</a></li><li class="tocline"><a href="#the-pending-element" class="tocxref"><span class="secno">1.5 </span>The <code>pending</code> element</a></li><li class="tocline"><a href="#the-context-element" class="tocxref"><span class="secno">1.6 </span>The <code>context</code> element</a></li><li class="tocline"><a href="#the-expect-element" class="tocxref"><span class="secno">1.7 </span>The <code>expect</code> element</a></li><li class="tocline"><a href="#the-input-element" class="tocxref"><span class="secno">1.8 </span>The <code>input</code> element</a></li><li class="tocline"><a href="#the-option-element" class="tocxref"><span class="secno">1.9 </span>The <code>option</code> element</a></li><li class="tocline"><a href="#the-param-element" class="tocxref"><span class="secno">1.10 </span>The <code>param</code> element</a></li><li class="tocline"><a href="#the-document-element" class="tocxref"><span class="secno">1.11 </span>The <code>document</code> element</a></li></ul></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li></ul></section>
+</section><section id="toc"><h2 class="introductory" aria-level="1" role="heading" id="h2_toc">Table of Contents</h2><ul class="toc" role="directory" id="respecContents"><li class="tocline"><a href="#definitions" class="tocxref"><span class="secno">1. </span>Definitions</a><ul class="toc"><li class="tocline"><a href="#the-description-element" class="tocxref"><span class="secno">1.1 </span>The <code>description</code> element</a></li><li class="tocline"><a href="#the-script-element" class="tocxref"><span class="secno">1.2 </span>The <code>script</code> element</a></li><li class="tocline"><a href="#the-import-element" class="tocxref"><span class="secno">1.3 </span>The <code>import</code> element</a></li><li class="tocline"><a href="#the-scenario-element" class="tocxref"><span class="secno">1.4 </span>The <code>scenario</code> element</a></li><li class="tocline"><a href="#the-call-element" class="tocxref"><span class="secno">1.5 </span>The <code>call</code> element</a></li><li class="tocline"><a href="#the-pending-element" class="tocxref"><span class="secno">1.6 </span>The <code>pending</code> element</a></li><li class="tocline"><a href="#the-context-element" class="tocxref"><span class="secno">1.7 </span>The <code>context</code> element</a></li><li class="tocline"><a href="#the-expect-element" class="tocxref"><span class="secno">1.8 </span>The <code>expect</code> element</a></li><li class="tocline"><a href="#the-input-element" class="tocxref"><span class="secno">1.9 </span>The <code>input</code> element</a></li><li class="tocline"><a href="#the-option-element" class="tocxref"><span class="secno">1.10 </span>The <code>option</code> element</a></li><li class="tocline"><a href="#the-param-element" class="tocxref"><span class="secno">1.11 </span>The <code>param</code> element</a></li><li class="tocline"><a href="#the-document-element" class="tocxref"><span class="secno">1.12 </span>The <code>document</code> element</a></li></ul></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li></ul></section>
         
 <section xmlns:x="http://www.daisy.org/ns/pipeline/xproc/test" xmlns:f="http://www.daisy.org/ns/pipeline/xproc/test/internal-functions" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" id="definitions">
 <!--OddPage--><h2 aria-level="1" role="heading" id="h2_definitions"><span class="secno">1. </span>Definitions</h2>
 <section id="the-description-element" typeof="bibo:Chapter" resource="#the-description-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-description-element"><span class="secno">1.1 </span>The <code>description</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-import-element"><code>import</code></a><small title="zero or more">*</small></dd><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-description-pending"><code>pending</code></a><small title="optional">?</small></dd><dd><a href="#attr-description-script"><code>script</code></a></dd><dd><a href="#attr-description-version"><code>version</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-description-element"><span class="secno">1.1 </span>The <code>description</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-script-element"><code>script</code></a><small title="optional">?</small></dd><dd><a href="#the-import-element"><code>import</code></a><small title="zero or more">*</small></dd><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-description-pending"><code>pending</code></a><small title="optional">?</small></dd><dd><a href="#attr-description-script"><code>script</code></a><small title="optional">?</small></dd><dd><a href="#attr-description-version"><code>version</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>The <a href="#the-description-element"><code>description</code></a> element is the root element of an xprocspec test and describes the functionality of a specific XProc script.</p>
 
 <p id="attr-description-pending">Assertions or scenarios with the <a href="#attr-description-pending"><code>pending</code></a> attribute will remain untested, but will be
@@ -249,8 +249,20 @@ <h3 aria-level="2" role="heading" id="h3_the-description-element"><span class="s
 <p id="attr-description-version">The <a href="#attr-description-version"><code>version</code></a> attribute can be used to aid development over time.</p>
 </section>
 
+<section id="the-script-element" typeof="bibo:Chapter" resource="#the-script-element" rel="bibo:Chapter">
+<h3 aria-level="2" role="heading" id="h3_the-script-element"><span class="secno">1.2 </span>The <code>script</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-declare-step-element"><code>declare-step</code></a><small title="optional">?</small></dd><dd><a href="#the-pipeline-element"><code>pipeline</code></a><small title="optional">?</small></dd><dd><a href="#the-library-element"><code>library</code></a><small title="optional">?</small></dd><dt>Content attributes:</dt><dd>None.</dd></dl>
+<p>The script element can be used insted of the <a href="#attr-script-script"><code>script</code></a> attribute.
+                It allows you to inline the XProc script to test.
+                The base URI of the script is the same as the containing xprocspec document,
+                unless otherwise specified using <code>xml:base</code>. One of the <code id="the-declare-step-element">p:declare-step</code>,
+                <code id="the-pipeline-element">p:pipeline</code> or <code id="the-library-element">p:library</code> elements must be used.</p>
+
+</section>
+
+
+
 <section id="the-import-element" typeof="bibo:Chapter" resource="#the-import-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-import-element"><span class="secno">1.2 </span>The <code>import</code> element</h3><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-import-href"><code>href</code></a></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-import-element"><span class="secno">1.3 </span>The <code>import</code> element</h3><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-import-href"><code>href</code></a></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>
                 An import runs the xprocspec description in the referenced file. It has no
                 effect on the scenarios in the current document, but can be a useful method
@@ -263,7 +275,7 @@ <h3 aria-level="2" role="heading" id="h3_the-import-element"><span class="secno"
 </section>
 
 <section id="the-scenario-element" typeof="bibo:Chapter" resource="#the-scenario-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-scenario-element"><span class="secno">1.3 </span>The <code>scenario</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-call-element"><code>call</code></a><small title="optional">?</small></dd><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dd><a href="#the-context-element"><code>context</code></a><small title="zero or more">*</small></dd><dd><a href="#the-expect-element"><code>expect</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-scenario-focus"><code>focus</code></a><small title="optional">?</small></dd><dd><a href="#attr-scenario-label"><code>label</code></a></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-scenario-element"><span class="secno">1.4 </span>The <code>scenario</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-call-element"><code>call</code></a><small title="optional">?</small></dd><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dd><a href="#the-context-element"><code>context</code></a><small title="zero or more">*</small></dd><dd><a href="#the-expect-element"><code>expect</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-scenario-focus"><code>focus</code></a><small title="optional">?</small></dd><dd><a href="#attr-scenario-label"><code>label</code></a></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>
                 A scenario groups together the definition of the script environment
                 (the <a href="#the-call-element"><code>call</code></a> element) and the script assertions (the <a href="#the-context-element"><code>context</code></a> and
@@ -282,7 +294,7 @@ <h3 aria-level="2" role="heading" id="h3_the-scenario-element"><span class="secn
 </section>
 
 <section id="the-call-element" typeof="bibo:Chapter" resource="#the-call-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-call-element"><span class="secno">1.4 </span>The <code>call</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-input-element"><code>input</code></a><small title="zero or more">*</small></dd><dd><a href="#the-option-element"><code>option</code></a><small title="zero or more">*</small></dd><dd><a href="#the-param-element"><code>param</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-call-step"><code>step</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-call-element"><span class="secno">1.5 </span>The <code>call</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-input-element"><code>input</code></a><small title="zero or more">*</small></dd><dd><a href="#the-option-element"><code>option</code></a><small title="zero or more">*</small></dd><dd><a href="#the-param-element"><code>param</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-call-step"><code>step</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>
                 A <a href="#the-call-element"><code>call</code></a> element defines a step call and the
                 inputs, options and parameters passed to it.
@@ -298,7 +310,7 @@ <h3 aria-level="2" role="heading" id="h3_the-call-element"><span class="secno">1
 
 
 <section id="the-pending-element" typeof="bibo:Chapter" resource="#the-pending-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-pending-element"><span class="secno">1.5 </span>The <code>pending</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-pending-label"><code>label</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-pending-element"><span class="secno">1.6 </span>The <code>pending</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-scenario-element"><code>scenario</code></a><small title="zero or more">*</small></dd><dd><a href="#the-pending-element"><code>pending</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-pending-label"><code>label</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p><em>TODO</em>: the element <code>pending</code> has not been documented yet.</p>
 
 <p id="attr-pending-label">The <a href="#attr-pending-label"><code>label</code></a> attribute is used to describe the current element in human-readable words.</p>
@@ -307,7 +319,7 @@ <h3 aria-level="2" role="heading" id="h3_the-pending-element"><span class="secno
 
 
 <section id="the-context-element" typeof="bibo:Chapter" resource="#the-context-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-context-element"><span class="secno">1.6 </span>The <code>context</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-document-element"><code>document</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-context-label"><code>label</code></a><small title="optional">?</small></dd><dd><a href="#attr-context-pending"><code>pending</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-context-element"><span class="secno">1.7 </span>The <code>context</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-document-element"><code>document</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-context-label"><code>label</code></a><small title="optional">?</small></dd><dd><a href="#attr-context-pending"><code>pending</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>Defines the context against which assertions are made.</p>
 
 <p id="attr-context-label">The <a href="#attr-context-label"><code>label</code></a> attribute is used to describe the current element in human-readable words.</p>
@@ -318,7 +330,7 @@ <h3 aria-level="2" role="heading" id="h3_the-context-element"><span class="secno
 </section>
 
 <section id="the-expect-element" typeof="bibo:Chapter" resource="#the-expect-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-expect-element"><span class="secno">1.7 </span>The <code>expect</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-document-element"><code>document</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-expect-equals"><code>equals</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-focus"><code>focus</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-grammar"><code>grammar</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-href"><code>href</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-label"><code>label</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-max"><code>max</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-min"><code>min</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-normalize-space"><code>normalize-space</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-pending"><code>pending</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-step"><code>step</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-test"><code>test</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-type"><code>type</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-expect-element"><span class="secno">1.8 </span>The <code>expect</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-document-element"><code>document</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-expect-equals"><code>equals</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-focus"><code>focus</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-grammar"><code>grammar</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-href"><code>href</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-label"><code>label</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-max"><code>max</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-min"><code>min</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-normalize-space"><code>normalize-space</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-pending"><code>pending</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-step"><code>step</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-test"><code>test</code></a><small title="optional">?</small></dd><dd><a href="#attr-expect-type"><code>type</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>
                 Defines what is expected from the context document(s).
             </p>
@@ -396,14 +408,14 @@ <h3 aria-level="2" role="heading" id="h3_the-expect-element"><span class="secno"
 
 
 <section id="the-input-element" typeof="bibo:Chapter" resource="#the-input-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-input-element"><span class="secno">1.8 </span>The <code>input</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-document-element"><code>document</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-input-port"><code>port</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-input-element"><span class="secno">1.9 </span>The <code>input</code> element</h3><dl class="element"><dt>Content model:</dt><dd><a href="#the-document-element"><code>document</code></a><small title="zero or more">*</small></dd><dt>Content attributes:</dt><dd><a href="#attr-input-port"><code>port</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>The input element is used to provide documents on the input ports of the XProc step you are testing.</p>
 
 <p id="attr-input-port">
 </p></section>
 
 <section id="the-option-element" typeof="bibo:Chapter" resource="#the-option-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-option-element"><span class="secno">1.9 </span>The <code>option</code> element</h3><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-option-name"><code>name</code></a><small title="optional">?</small></dd><dd><a href="#attr-option-select"><code>select</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-option-element"><span class="secno">1.10 </span>The <code>option</code> element</h3><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-option-name"><code>name</code></a><small title="optional">?</small></dd><dd><a href="#attr-option-select"><code>select</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>The option element is used to provide values to XProc options on the XProc step you are testing.</p>
 
 <p id="attr-option-name">The <a href="#attr-option-name"><code>name</code></a> attribute is the name of the option used in the XProc step.</p>
@@ -416,7 +428,7 @@ <h3 aria-level="2" role="heading" id="h3_the-option-element"><span class="secno"
 </section>
 
 <section id="the-param-element" typeof="bibo:Chapter" resource="#the-param-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-param-element"><span class="secno">1.10 </span>The <code>param</code> element</h3><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-param-name"><code>name</code></a><small title="optional">?</small></dd><dd><a href="#attr-param-select"><code>select</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-param-element"><span class="secno">1.11 </span>The <code>param</code> element</h3><dl class="element"><dt>Content model:</dt><dd>Empty.</dd><dt>Content attributes:</dt><dd><a href="#attr-param-name"><code>name</code></a><small title="optional">?</small></dd><dd><a href="#attr-param-select"><code>select</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>The param element is used to provide values to XProc paramaters on the XProc step you are testing.</p>
 
 <p id="attr-param-name">The <a href="#attr-param-name"><code>name</code></a> attribute is the name of the parameter to be provided on the XProc steps primary parameter input
@@ -439,7 +451,7 @@ <h3 aria-level="2" role="heading" id="h3_the-param-element"><span class="secno">
 
 
 <section id="the-document-element" typeof="bibo:Chapter" resource="#the-document-element" rel="bibo:Chapter">
-<h3 aria-level="2" role="heading" id="h3_the-document-element"><span class="secno">1.11 </span>The <code>document</code> element</h3><dl class="element"><dt>Content model:</dt><dd>One element from any namespace. (optional)</dd><dt>Content attributes:</dt><dd><a href="#attr-document-base-uri"><code>base-uri</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-href"><code>href</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-method"><code>method</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-port"><code>port</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-position"><code>position</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-recursive"><code>recursive</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-select"><code>select</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-type"><code>type</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
+<h3 aria-level="2" role="heading" id="h3_the-document-element"><span class="secno">1.12 </span>The <code>document</code> element</h3><dl class="element"><dt>Content model:</dt><dd>One element from any namespace. (optional)</dd><dt>Content attributes:</dt><dd><a href="#attr-document-base-uri"><code>base-uri</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-href"><code>href</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-method"><code>method</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-port"><code>port</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-position"><code>position</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-recursive"><code>recursive</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-select"><code>select</code></a><small title="optional">?</small></dd><dd><a href="#attr-document-type"><code>type</code></a><small title="optional">?</small></dd><dd>Zero or more attributes from any namespace.</dd></dl>
 <p>The <a href="#the-document-element"><code>document</code></a> element is used to define which documents are provided on a steps input ports, what the context is when making assertions, and for assertions when making comparisons
                     or performing validations. It can be used in a number of ways:</p>
 
diff --git a/xprocspec/pom.xml b/xprocspec/pom.xml
index ba3fe2d..d0190ef 100644
--- a/xprocspec/pom.xml
+++ b/xprocspec/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.daisy</groupId>
     <artifactId>xprocspec</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>xprocspec</name>
diff --git a/xprocspec/src/it/it-xprocspec/src/test/xprocspec/tests/script-1.xprocspec b/xprocspec/src/it/it-xprocspec/src/test/xprocspec/tests/script-1.xprocspec
new file mode 100644
index 0000000..a97ce96
--- /dev/null
+++ b/xprocspec/src/it/it-xprocspec/src/test/xprocspec/tests/script-1.xprocspec
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="http://www.daisy.org/ns/xprocspec/xprocspec.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<x:description xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:x="http://www.daisy.org/ns/xprocspec" xmlns:e="http://example.net/ns" xmlns:p="http://www.w3.org/ns/xproc">
+
+    <x:script>
+        <p:declare-step type="e:identity" version="1.0">
+            <p:input port="source" sequence="true"/>
+            <p:output port="result" sequence="true"/>
+            <p:identity/>
+        </p:declare-step>
+    </x:script>
+
+    <x:scenario label="identity - invoking inlined XProc script">
+        <x:call step="e:identity">
+            <x:input port="source">
+                <x:document type="inline">
+                    <doc/>
+                </x:document>
+            </x:input>
+        </x:call>
+
+        <x:context label="result port">
+            <x:document type="port" port="result"/>
+        </x:context>
+        <x:expect type="count" label="there should be exactly one document on the result port" min="1" max="1"/>
+
+    </x:scenario>
+
+</x:description>
diff --git a/xprocspec/src/main/resources/content/xml/schema/xprocspec.preprocess.rng b/xprocspec/src/main/resources/content/xml/schema/xprocspec.preprocess.rng
index 90ff2cb..5d929eb 100644
--- a/xprocspec/src/main/resources/content/xml/schema/xprocspec.preprocess.rng
+++ b/xprocspec/src/main/resources/content/xml/schema/xprocspec.preprocess.rng
@@ -30,6 +30,23 @@
             </element>
         </define>
 
+        <define name="description.common">
+            <ref name="common-attributes"/>
+            <attribute name="script">
+                <a:documentation xmlns="http://www.w3.org/1999/xhtml">The `script` attribute is a URI that points to the XProc script you want to test.</a:documentation>
+                <data type="anyURI"/>
+            </attribute>
+            <optional>
+                <attribute name="version">
+                    <a:documentation xmlns="http://www.w3.org/1999/xhtml">The `version` attribute can be used to aid development over time.</a:documentation>
+                    <data type="NMTOKEN"/>
+                </attribute>
+            </optional>
+            <optional>
+                <ref name="pending-attribute"/>
+            </optional>
+        </define>
+
         <define name="pending-scenario">
             <ref name="pending-scenario-attribute"/>
         </define>
diff --git a/xprocspec/src/main/resources/content/xml/schema/xprocspec.rng b/xprocspec/src/main/resources/content/xml/schema/xprocspec.rng
index 3134f96..4dc6f2e 100644
--- a/xprocspec/src/main/resources/content/xml/schema/xprocspec.rng
+++ b/xprocspec/src/main/resources/content/xml/schema/xprocspec.rng
@@ -38,10 +38,13 @@
 
     <define name="description.common">
         <ref name="common-attributes"/>
-        <attribute name="script">
-            <a:documentation xmlns="http://www.w3.org/1999/xhtml">The `script` attribute is a URI that points to the XProc script you want to test.</a:documentation>
-            <data type="anyURI"/>
-        </attribute>
+        <choice>
+            <ref name="script"/>
+            <attribute name="script">
+                <a:documentation xmlns="http://www.w3.org/1999/xhtml">The `script` attribute is a URI that points to the XProc script you want to test.</a:documentation>
+                <data type="anyURI"/>
+            </attribute>
+        </choice>
         <optional>
             <attribute name="version">
                 <a:documentation xmlns="http://www.w3.org/1999/xhtml">The `version` attribute can be used to aid development over time.</a:documentation>
@@ -53,6 +56,35 @@
         </optional>
     </define>
 
+    <define name="script">
+        <element name="script" ns="http://www.daisy.org/ns/xprocspec">
+            <a:documentation xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve">
+                <p>The script element can be used insted of the <code>script</code> attribute.
+                It allows you to inline the XProc script to test.
+                The base URI of the script is the same as the containing xprocspec document,
+                unless otherwise specified using `xml:base`. One of the <code id="the-declare-step-element">p:declare-step</code>,
+                <code id="the-pipeline-element">p:pipeline</code> or <code id="the-library-element">p:library</code> elements must be used.</p>
+            </a:documentation>
+            <choice>
+                <element name="declare-step" ns="http://www.w3.org/ns/xproc">
+                    <a:documentation>XProc step declaration</a:documentation>
+                    <ref name="any-attribute"/>
+                    <ref name="any-content"/>
+                </element>
+                <element name="pipeline" ns="http://www.w3.org/ns/xproc">
+                    <a:documentation>XProc pipeline declaration</a:documentation>
+                    <ref name="any-attribute"/>
+                    <ref name="any-content"/>
+                </element>
+                <element name="library" ns="http://www.w3.org/ns/xproc">
+                    <a:documentation>XProc library declaration</a:documentation>
+                    <ref name="any-attribute"/>
+                    <ref name="any-content"/>
+                </element>
+            </choice>
+        </element>
+    </define>
+
     <define name="common-attributes">
         <zeroOrMore>
             <attribute>
diff --git a/xprocspec/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl b/xprocspec/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl
index d725605..4d91f05 100644
--- a/xprocspec/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl
+++ b/xprocspec/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl
@@ -500,6 +500,7 @@
     <p:for-each name="for-each">
         <p:output port="scenarios" sequence="true"/>
         <p:variable name="base" select="base-uri(/*)"/>
+        <p:variable name="scenario-position" select="p:iteration-position()"/>
 
         <p:identity name="try.input"/>
         <p:try>
@@ -529,6 +530,33 @@
                                 <p:empty/>
                             </p:with-option>
                         </pxi:perform-imports>
+                        
+                        <!-- externalize inline script if present -->
+                        <p:choose>
+                            <p:when test="/*/x:script">
+                                <p:identity name="main-document.before-script-store"/>
+                                <p:add-attribute match="/*/x:script/*" attribute-name="xml:base">
+                                    <p:with-option name="attribute-value" select="/*/x:script/*/base-uri()"/>
+                                </p:add-attribute>
+                                <p:filter select="/*/x:script/*"/>
+                                <p:store name="script-stored">
+                                    <p:with-option name="href" select="concat($temp-dir,'script',$scenario-position,'.xpl')"/>
+                                </p:store>
+                                <p:add-attribute match="/*" attribute-name="script">
+                                    <p:with-option name="attribute-value" select="/*/text()">
+                                        <p:pipe port="result" step="script-stored"/>
+                                    </p:with-option>
+                                    <p:input port="source">
+                                        <p:pipe port="result" step="main-document.before-script-store"/>
+                                    </p:input>
+                                </p:add-attribute>
+                                <p:delete match="/*/x:script"/>
+                            </p:when>
+                            <p:otherwise>
+                                <p:identity/>
+                            </p:otherwise>
+                        </p:choose>
+                        
                         <p:identity name="main-document"/>
 
                         <p:group>