From 1aede8bf779b58dfc98ac49703b39cbcfeb6af34 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 2 Nov 2011 08:50:53 +0000
Subject: [PATCH] Quickbook: Make windows paths an error in 1.6

[SVN r75267]
---
 src/actions.cpp                          | 13 ++++++++++---
 test/Jamfile.v2                          |  1 +
 test/include-1_5.quickbook               |  2 +-
 test/include_win_path-1_6-fail.quickbook |  5 +++++
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 test/include_win_path-1_6-fail.quickbook

diff --git a/src/actions.cpp b/src/actions.cpp
index 3a93299..2a7e845 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -752,11 +752,14 @@ namespace quickbook
 
         if(fileref.find('\\') != std::string::npos)
         {
-            detail::outwarn(attributes["fileref"].get_file(), attributes["fileref"].get_position())
+            (qbk_version_n >= 106u ?
+                detail::outerr(attributes["fileref"].get_file(), attributes["fileref"].get_position()) :
+                detail::outwarn(attributes["fileref"].get_file(), attributes["fileref"].get_position()))
                 << "Image path isn't portable: '"
                 << detail::utf8(fileref)
                 << "'"
                 << std::endl;
+            if (qbk_version_n >= 106u) ++actions.error_count;
         }
 
         boost::replace(fileref, '\\', '/');
@@ -1671,10 +1674,14 @@ namespace quickbook
 
         if(path_text.find('\\') != std::string::npos)
         {
-            detail::outwarn(path.get_file(), path.get_position())
-                << "Path isn't portable: "
+            (qbk_version_n >= 106u ?
+                detail::outerr(path.get_file(), path.get_position()) :
+                detail::outwarn(path.get_file(), path.get_position()))
+                << "Path isn't portable: '"
                 << detail::utf8(path_text)
+                << "'"
                 << std::endl;
+            if (qbk_version_n >= 106u) ++actions.error_count;
         }
         
         boost::replace(path_text, '\\', '/');
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index e35e040..4fa99dd 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -50,6 +50,7 @@ test-suite quickbook.test :
     [ quickbook-test include-1_5 ]
     [ quickbook-test include-1_6 ]
     [ quickbook-test include2-1_6 ]
+    [ quickbook-error-test include_win_path-1_6-fail ]
     [ quickbook-test link-1_1 ]
     [ quickbook-test list_test-1_5 ]
     [ quickbook-test macro-1_5 ]
diff --git a/test/include-1_5.quickbook b/test/include-1_5.quickbook
index 93dc2fa..849d19c 100644
--- a/test/include-1_5.quickbook
+++ b/test/include-1_5.quickbook
@@ -4,7 +4,7 @@
 ]
 
 [include include_sub-1_5.qbk]
-[include include_sub.qbk]
+[include .\include_sub.qbk]
 [include:foo include_sub.qbk]
 [include empty.qbk]
 
diff --git a/test/include_win_path-1_6-fail.quickbook b/test/include_win_path-1_6-fail.quickbook
new file mode 100644
index 0000000..2e25423
--- /dev/null
+++ b/test/include_win_path-1_6-fail.quickbook
@@ -0,0 +1,5 @@
+[article Include fail for windows path.
+[quickbook 1.6]
+]
+
+[include .\empty.qbk]