titlecase: all non-letters are considered word-separators

This is to be consistent with `istitle`.
JuliaLang · Aug 22, 2017 · d12bf25 · d12bf25
1 parent 637c623
commit d12bf25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -1709,7 +1709,7 @@ export hex2num
 @deprecate diagm(A::SparseMatrixCSC) spdiagm(sparsevec(A))
 
 # PR #23393
-@deprecate titlecase(s::AbstractString) titlecase(s, false)
+@deprecate titlecase(s::AbstractString) titlecase(s, false, true)
 
 # END 0.7 deprecations
 

diff --git a/base/strings/basic.jl b/base/strings/basic.jl
@@ -423,17 +423,23 @@ julia> titlecase("ISS - international space station", false)
 "ISS - International Space Station"
 ```
 """
-function titlecase(s::AbstractString, strict::Bool)
+function titlecase(s::AbstractString, strict::Bool, compat=false)
     startword = true
     b = IOBuffer()
     for c in s
-        if isspace(c)
+        if compat
+            if isspace(c)
+                print(b, c)
+                startword = true
+                continue
+            end
+        elseif !iscased(c)
             print(b, c)
             startword = true
-        else
-            print(b, startword ? titlecase(c) : strict ? lowercase(c) : c)
-            startword = false
+            continue
         end
+        print(b, startword ? titlecase(c) : strict ? lowercase(c) : c)
+        startword = false
     end
     return String(take!(b))
 end