Fixed: Some path attributes were processed as escaped Python strings which

could result in corrupted path names with backslash separated Windows path
names. Reported by Will. See:
http://groups.google.com/group/asciidoc/browse_thread/thread/e8f3938bcb4c8bb4/44d13113a35738ef

5 files changed, 18 insertions, 18 deletions

diff --git a/examples/website/layout1.conf b/examples/website/layout1.conf
index 71641d5..b56c0ff 100644
--- a/examples/website/layout1.conf
+++ b/examples/website/layout1.conf
@@ -74,7 +74,7 @@ endif::latexmath[]
   <div>&#187;<a href="testasciidoc.html">Tests</a></div>
   <div>&#187;<a href="CHANGELOG.html">ChangeLog</a></div>
   <div>&#187;<a href="support.html">Support</a></div>
-  <div id="page-source">&#187;<a href="{eval:os.path.basename('{infile}')}">Page&nbsp;Source</a></div>
+  <div id="page-source">&#187;<a href="{eval:os.path.basename(r'{infile}')}">Page&nbsp;Source</a></div>
 </td>
 <td>
 <div id="layout-content">
diff --git a/examples/website/layout2.conf b/examples/website/layout2.conf
index a3ee99f..f8806d3 100644
--- a/examples/website/layout2.conf
+++ b/examples/website/layout2.conf
@@ -77,7 +77,7 @@ endif::latexmath[]
   <div>&#187;<a href="testasciidoc.html">Tests</a></div>
   <div>&#187;<a href="CHANGELOG.html">ChangeLog</a></div>
   <div>&#187;<a href="support.html">Support</a></div>
-  <div id="page-source">&#187;<a href="{eval:os.path.basename('{infile}')}">Page&nbsp;Source</a></div>
+  <div id="page-source">&#187;<a href="{eval:os.path.basename(r'{infile}')}">Page&nbsp;Source</a></div>
 </div>
 </div>
 <div id="layout-content-box">
diff --git a/html5.conf b/html5.conf
index 7a94131..4ec5ee9 100644
--- a/html5.conf
+++ b/html5.conf
@@ -80,8 +80,8 @@ latexmath-style=template="latexmathblock",subs=[]
 <span class="image{role? {role}}">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"}>
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys3:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}">
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys3:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}">
 {link#}</a>
 </span>
 
@@ -90,8 +90,8 @@ latexmath-style=template="latexmathblock",subs=[]
 <div class="content">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}>
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}">
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}">
 {link#}</a>
 </div>
 <div class="title">{caption={figure-caption} {counter:figure-number}. }{title}</div>
@@ -147,7 +147,7 @@ ifndef::data-uri[]
 endif::data-uri[]
 ifdef::data-uri[]
 <img alt="{index}" src="data:image/png;base64,
-{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/callouts/{index}.png}")}"}">
+{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/callouts/{index}.png}")}"}">
 endif::data-uri[]
 endif::icons[]
 
@@ -210,7 +210,7 @@ ifndef::data-uri[]
 item=<tr><td><img src="{iconsdir}/callouts/{listindex}.png" alt="{listindex}"></td><td>|</td></tr>
 endif::data-uri[]
 ifdef::data-uri[]
-item=<tr><td><img alt="{listindex}" src="data:image/png;base64, {sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/callouts/{listindex}.png}")}"}"></td><td>|</td></tr>
+item=<tr><td><img alt="{listindex}" src="data:image/png;base64, {sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/callouts/{listindex}.png}")}"}"></td><td>|</td></tr>
 endif::data-uri[]
 text=|
 endif::icons[]
@@ -375,7 +375,7 @@ template::[quoteblock]
 <td class="icon">
 {data-uri%}{icons#}<img src="{icon={iconsdir}/{name}.png}" alt="{caption}">
 {data-uri#}{icons#}<img alt="{caption}" src="data:image/png;base64,
-{data-uri#}{icons#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/{name}.png}")}"}">
+{data-uri#}{icons#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/{name}.png}")}"}">
 {icons%}<div class="title">{caption}</div>
 </td>
 <td class="content">
diff --git a/xhtml11-quirks.conf b/xhtml11-quirks.conf
index bbdd3f0..c20376e 100644
--- a/xhtml11-quirks.conf
+++ b/xhtml11-quirks.conf
@@ -9,8 +9,8 @@
 <div class="content">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}" />
 {link#}</a>
 </div>
 <div class="image-title">{caption={figure-caption} {counter:figure-number}: }{title}</div>
diff --git a/xhtml11.conf b/xhtml11.conf
index 62cb59a..a86b956 100644
--- a/xhtml11.conf
+++ b/xhtml11.conf
@@ -79,8 +79,8 @@ latexmath-style=template="latexmathblock",subs=[]
 <span class="image{role? {role}}">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} />
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys3:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys3:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}" />
 {link#}</a>
 </span>
 
@@ -89,8 +89,8 @@ latexmath-style=template="latexmathblock",subs=[]
 <div class="content">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}" />
 {link#}</a>
 </div>
 <div class="title">{caption={figure-caption} {counter:figure-number}. }{title}</div>
@@ -128,7 +128,7 @@ ifndef::data-uri[]
 endif::data-uri[]
 ifdef::data-uri[]
 <img alt="{index}" src="data:image/png;base64,
-{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/callouts/{index}.png}")}"}" />
+{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/callouts/{index}.png}")}"}" />
 endif::data-uri[]
 endif::icons[]
 
@@ -191,7 +191,7 @@ ifndef::data-uri[]
 item=<tr><td><img src="{iconsdir}/callouts/{listindex}.png" alt="{listindex}" /></td><td>|</td></tr>
 endif::data-uri[]
 ifdef::data-uri[]
-item=<tr><td><img alt="{listindex}" src="data:image/png;base64, {sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/callouts/{listindex}.png}")}"}" /></td><td>|</td></tr>
+item=<tr><td><img alt="{listindex}" src="data:image/png;base64, {sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/callouts/{listindex}.png}")}"}" /></td><td>|</td></tr>
 endif::data-uri[]
 text=|
 endif::icons[]
@@ -356,7 +356,7 @@ template::[quoteblock]
 <td class="icon">
 {data-uri%}{icons#}<img src="{icon={iconsdir}/{name}.png}" alt="{caption}" />
 {data-uri#}{icons#}<img alt="{caption}" src="data:image/png;base64,
-{data-uri#}{icons#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/{name}.png}")}"}" />
+{data-uri#}{icons#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/{name}.png}")}"}" />
 {icons%}<div class="title">{caption}</div>
 </td>
 <td class="content">