Include file component in regex strings for schema being compiled

2 files changed, 16 insertions, 47 deletions

diff --git a/documentation/xsde.1 b/documentation/xsde.1
index afafa8c..2562446 100644
--- a/documentation/xsde.1
+++ b/documentation/xsde.1
@@ -255,23 +255,19 @@ expressions are applied to a string in the form
 
 .I filename namespace
 
-For example,
-
-.B XMLSchema.xsd http://www.w3.org/2001/XMLSchema
-
-The
-.I filename
-for the current translation unit is empty. For example, if you have file
+For example, if you have file
 .B hello.xsd
 with namespace
 .B http://example.com/hello
 and you run
-.B xsde
-on this file, then the string in question would be:
+.B xsd
+on this file, then the string in question will be:
+
+.B hello.xsd. http://example.com/hello
 
-.B \ http://example.com/hello
+For the built-in XML Schema namespace the string is:
 
-Note the leading space.
+.B XMLSchema.xsd http://www.w3.org/2001/XMLSchema
 
 The following three steps are performed for each regular expression until
 the match is found:
@@ -763,26 +759,12 @@ in the form
 
 .I filename namespace xpath
 
-For example,
+For instance:
 
 .B hello.xsd http://example.com/hello element
 
 .B hello.xsd http://example.com/hello type/element
 
-The
-.I filename
-for the current translation unit is empty. For example, if you have file
-.B hello.xsd
-with namespace
-.B http://example.com/hello
-and you run
-.B xsde
-on this file, then the string in question would be:
-
-.B \ http://example.com/hello element
-
-Note the leading space.
-
 As an example, the following expression makes all the derived
 names start with capital letters. This could be useful when
 your naming convention requires type names to start with
diff --git a/documentation/xsde.xhtml b/documentation/xsde.xhtml
index 31c2f03..f734f5d 100644
--- a/documentation/xsde.xhtml
+++ b/documentation/xsde.xhtml
@@ -227,19 +227,16 @@
 
       <p><code><i>filename</i> <i>namespace</i></code></p>
 
-      <p>For example,</p>
-
-      <p><code><b>XMLSchema.xsd http://www.w3.org/2001/XMLSchema</b></code></p>
-
-      <p>The <code><i>filename</i></code> for the current translation unit
-        is empty. For example, if you have file <code><b>hello.xsd</b></code>
+      <p>For example, if you have file <code><b>hello.xsd</b></code>
         with namespace <code><b>http://example.com/hello</b></code> and you run
-        <code><b>xsde</b></code> on this file, then the string in question
-        would be:</p>
+        <code><b>xsd</b></code> on this file, then the string in question
+        will be:</p>
 
-      <p><code>&nbsp;<b>http://example.com/hello</b></code></p>
+      <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
 
-      <p>Note the leading space.</p>
+      <p>For the built-in XML Schema namespace the string is:</p>
+
+      <p><code><b>XMLSchema.xsd http://www.w3.org/2001/XMLSchema</b></code></p>
 
       <p>The following three steps are performed for each regular expression
         until the match is found:</p>
@@ -656,21 +653,11 @@
 
       <p><code><i>filename</i> <i>namespace</i> <i>xpath</i></code></p>
 
-      <p>For example,</p>
+      <p>For instance:</p>
 
       <p><code><b>hello.xsd http://example.com/hello element</b></code></p>
       <p><code><b>hello.xsd http://example.com/hello type/element</b></code></p>
 
-      <p>The <code><i>filename</i></code> for the current translation unit
-        is empty. For example, if you have file <code><b>hello.xsd</b></code>
-        with namespace <code><b>http://example.com/hello</b></code> and you run
-        <code><b>xsde</b></code> on this file, then the string in question
-        would be:</p>
-
-      <p><code>&nbsp;<b>http://example.com/hello element</b></code></p>
-
-      <p>Note the leading space.</p>
-
       <p>As an example, the following expression makes all the derived
          names start with capital letters. This could be useful when
          your naming convention requires type names to start with