merged ChangeLog with branch 'master' of github.com:RcppCore/Rcpp

Author: eddelbuettel

ChangeLog

@@ -3,6 +3,11 @@
         * .travis.yml (install): Switch to using ppa:edd/misc to install all the
         R packages needed for the Travis CI run as r-cran-* binary packages
 
+2015-02-13  JJ Allaire  <[email protected]>
+
+        * src/attributes.cpp: Allow 'R' to come immediately after '***'
+        for defining embedded R code chunks in sourceCpp
+
 2015-02-12  JJ Allaire  <[email protected]>
 
         * DESCRIPTION: bump version

inst/NEWS.Rd

@@ -25,6 +25,8 @@
       \item Support addition of the \code{rng} parameter in \code{Rcpp::export}
       to suppress the otherwise automatic inclusion of \code{RNGScope} in generated code.
       \item Version 3.2 of the Rtools is now correctly detected as well.
+      \item Allow 'R' to come immediately after '***' for defining embedded R
+      code chunks in sourceCpp.
     }
   }
 }

src/attributes.cpp

@@ -697,7 +697,7 @@ namespace attributes {
                                         Rcpp::CharacterVector linesVector,
                                         const std::deque<std::string>& lines) {
             Rcpp::List matches = regexMatches(linesVector,
-                                              "^\\s*/\\*{3,}\\s+[Rr]\\s*$");
+                                              "^\\s*/\\*{3,}\\s*[Rr]\\s*$");
             bool withinRBlock = false;
             CommentState commentState;
             std::vector<std::string> embeddedR;