2 files changed, 12 insertions, 5 deletions
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java
index a7e2b08..7943fb9 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/directives/CaseDirective.java
@@ -71,14 +71,13 @@ public class CaseDirective implements Directive {
 			Matcher mat = wordPattern.matcher(strang);
 
 			StringBuffer sb = new StringBuffer();
-			while(!mat.find()) {
+			while(mat.find()) {
 				mat.appendReplacement(sb, "");
 
 				String word = mat.group(1);
-				
-				word = word.substring(0, 1).toUpperCase() + word.substring(1);
+				String ward = word.substring(0, 1).toUpperCase() + word.substring(1);
 
-				sb.append(word);
+				sb.append(ward);
 				sb.append(mat.group(2));
 			}
 
@@ -90,7 +89,7 @@ public class CaseDirective implements Directive {
 
 			StringBuffer sb = new StringBuffer();
 			boolean doCap = true;
-			while(!mat.find()) {
+			while(mat.find()) {
 				mat.appendReplacement(sb, "");
 
 				String word = mat.group(1);
diff --git a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
index d3d7075..8b03172 100644
--- a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
+++ b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
@@ -118,6 +118,14 @@ public class CLFormatterTest {
 	}
 
 	@Test
+	public void testCasePrinting() {
+		assertFormat("abc", "~(~A~)", "AbC", "aBc", "aBc bCD", "abc Cad dAC");
+		assertFormat("ABC", "~@:(~A~)", "aBc");
+		assertFormat("ABc BCD", "~:(~A ~A~)", "aBc", "bCD");
+		assertFormat("Abc Cad dAC", "~@(~A~)", "abc Cad dAC");
+	}
+
+	@Test
 	public void testRandomCases() {
 		// Random test cases
 		assertEquals("3 dogs are here", format("~D dog~:[s are~; is~] here", 3, 3 == 1));