Updates documentation, fixes bug with SLF4j style formatting when mixed with Parseltongue

Author: cjbrooks12

License.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 JavaEden
+Copyright (c) 2018 JavaEden
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/main/java/com/caseyjbrooks/clog/parseltongue/Parseltongue.java

@@ -447,9 +447,11 @@ private ParseltonguePair<Boolean, Object> param() {
                     int index = b.getIntValue();
 
                     if(index > 0 && (index - 1) < params.size()) {
+                        autoParamCounter++;
                         return new ParseltonguePair<>(true, params.get(index - 1));
                     }
                     else {
+                        autoParamCounter++;
                         return new ParseltonguePair<>(true, null);
                     }
                 }
@@ -615,7 +617,7 @@ private ParseltonguePair<Boolean, NullObject> nullLit() {
             return new ParseltonguePair<>(false, null);
         }
 
-        //result ::= ATSIGN NUMBER
+        //autoParam ::=
         private ParseltonguePair<Boolean, Object> autoParam() {
             Token a = ts.get();
 

src/orchid/resources/changelog/1_6_3.md

@@ -0,0 +1,8 @@
+---
+
+version: '1.6.3'
+
+---
+
+- Updates Orchid documentation
+- fixes bug with SLF4j style formatting when mixed with Parseltongue

src/orchid/resources/pages/android-clog.md

@@ -1,117 +1,121 @@
 ---
+
 title: Android Clog
+
 ---
 
-<section class="bs-docs-section">
-  <h1 id="overview" class="page-header">Using Clog with Android</h1>
+# Using Clog with Android
+{ #overview .page-header }
+
+> Clog is a replacement of the standard Android Log. Featuring multiple logging profiles, removal of annoying tags, and 
+> the powerful Parselmouth formatting language, you'll wonder how you ever got by without it.
   
-  <blockquote>
-    Clog is a drop-in replacement of the standard Android Log. Featuing multiple logging profiles and the powerful Parselmouth formatting language, you'll wonder how you ever got by without it.
-  </blockquote>
+### Features
 
-  <h3 id="features">Features</h3>
+- All features of the base Clog library
+- Android-specific logging profiles for both development and production
 
-  <ul>
-    <li>All features of the base Clog library</li>
-    <li>Android-specific logging profiles for both development and production</li>
-  </ul>
+  
+# Get It
+{ #download .page-header }
 
-</section>
+### Include In Your Project
 
-<section class="bs-docs-section">
-  <h1 id="download" class="page-header">Get It</h1>
+Android Clog can be added to your project from Jitpack through Gradle.
 
-  <h3 id="download-include">Include In Your Project</h3>
-  <p>
-    Android Clog can be added to your project from Jitpack through Gradle.
-  </p>
+Add this to your project-level build.gradle:
 
-  <p>
-    Add this to your project-level build.gradle:
-  </p>
-  <pre>
+```groovy
 allprojects {
   repositories {
     ...
     maven { url "https://jitpack.io" }
   }
-}</pre>
+}
+```  
+
+Add this to your module's dependencies:
 
-  <p>
-    Add this to your module's dependencies:
-  </p>
-  <pre>
+```groovy
 dependencies {
   ...
-  compile('com.github.cjbrooks12:Android-Clog:v{{site.version}}@aar') {
-    transitive = true;
-  }
-}</pre>
+  api 'com.github.cjbrooks12:Android-Clog:v{{site.version}}'
+}
+```
+
 
-  <h3 id="download-github">Github</h3>
-  <p>
-    Full source can be viewed on Github. Feel free to send me a PR.
-  </p>
-  <div>
-    <a href="https://github.com/cjbrooks12/Android-Clog">Github Repo</a>
-  </div>
+### Github
 
-  <h3 id="download-jitpack">Jitpack</h3>
-  <p>
-    Download the most recent commits, or see instructions for installing with Maven, at Jitpack.
-  </p>
-  <div>
-    <a href="https://jitpack.io/#cjbrooks12/Android-Clog"><img src="https://camo.githubusercontent.com/86295ad9ade648308e2328e7b2aba032fed9cc0c/68747470733a2f2f6a69747061636b2e696f2f762f636a62726f6f6b7331322f416e64726f69642d436c6f672e737667" alt="" data-canonical-src="https://jitpack.io/v/cjbrooks12/Android-Clog.svg" style="max-width:100%;"></a>
-  </div>
+Full source can be viewed on [Github](https://github.com/cjbrooks12/Android-Clog). Feel free to send me a PR.
 
-  <h3 id="download-javadoc">View Javadoc</h3>
-  <p>
-    View javadoc, hosted by Jitpack.
-  </p>
-  <div>
-    <a href="https://jitpack.io/com/github/cjbrooks12/Clog/v{{site.version}}/javadoc/"><img src="https://camo.githubusercontent.com/e987e48872f10d633fc044d7e20e7b82f99df591/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f7461672f636a62726f6f6b7331322f436c6f672e7376673f6d61784167653d32353932303030266c6162656c3d6a617661646f63" alt="JitPack Javadoc" data-canonical-src="https://img.shields.io/github/tag/cjbrooks12/Clog.svg?maxAge=2592000&amp;label=javadoc" style="max-width:100%;"></a>
-  </div>
-</section>
+### Jitpack
 
-<section class="bs-docs-section">
-  <h1 id="use" class="page-header">Use in your apps</h1>
+Download the most recent commits, or see instructions for installing with Maven, at Jitpack.
+
+[![](https://jitpack.io/v/JavaEden/Clog.svg)](https://jitpack.io/#JavaEden/Clog)
+  
+### Javadoc
 
-  <h3 id="use-implementation">Clog implementation</h3>
+View javadoc, hosted by Jitpack.
 
-  <p>See <a href="https://github.com/cjbrooks12/Clog">https://github.com/cjbrooks12/Clog</a> for information on Clog.</p>
+[![](https://jitpack.io/v/JavaEden/Clog.svg)](https://jitpack.io/com/github/cjbrooks12/Clog/v{{site.version}}/javadoc/)
 
-  <p>Android Clog provides simple Android Log implementations for Clog. The mapping between Clog levels and Android Clog levels is one-to-one, as the Clog API was designed to directly replace Log:</p>
+# Use In Your Apps
+{ #download .page-header }
 
-  <p><code>Clog.d(...) --&gt; Log.d(...)</code></p>
+### Clog implementation
 
-  <p><code>Clog.e(...) --&gt; Log.e(...)</code></p>
+See [{{site.baseUrl}}]({{site.baseUrl}}) for information on Clog.
 
-  <p><code>Clog.i(...) --&gt; Log.i(...)</code></p>
+Android Clog provides simple Android Log implementations for Clog. The mapping between Clog levels and Android Clog 
+levels is one-to-one, as the Clog API was designed to replace Log, but be more flexible and not require tags with the 
+logging calls.
 
-  <p><code>Clog.v(...) --&gt; Log.v(...)</code></p>
+`Clog.v(...) ->> Log.v(...)`
 
-  <p><code>Clog.w(...) --&gt; Log.w(...)</code></p>
+`Clog.d(...) ->> Log.d(...)`
 
-  <p><code>Clog.wtf(...) --&gt; Log.wtf(...)</code></p>
+`Clog.i(...) ->> Log.i(...)`
 
-  <p>In addition, Clog tags work exactly like Android Log tags, like so:</p>
+`Clog.w(...) ->> Log.w(...)`
 
-  <pre>
-d(String tag, String message) {
-  Log.d(tag, message);
-}</pre>
+`Clog.e(...) ->> Log.e(...)`
 
-  <p>Getting Android Clog integrated into your project is easy. Add the following to your Activity's <code>onCreate()</code>:</p>
+`Clog.wtf(...) ->> Log.wtf(...)`
 
-  <pre>
+In addition, Clog gets rid of the annoying Android Log tags. By default, the Tag passed to the Android logger is the 
+simple classname of the calling class:
+
+```
+Clog.d(String message) ->> Log.d(callerClassName, message)
+```
+
+If, for some reason, you need to set the Tag to something other than the caller class's name, you can push a Tag into 
+Clog before logging:
+
+```
+Clog.pushTag(customTag);
+Clog.d(message); ->> Log.d(customTag, message)
+```
+
+Just make sure to pop it back off when you're done, otherwise other places will be logged with that tag as well.
+
+```
+Clog.popTag();
+```
+
+Getting Android Clog integrated into your project is easy. Add the following to your Activity's or Application's 
+`onCreate()` method:
+
+```java
 if(BuildConfig.DEBUG) {
   Clog.setCurrentProfile("dev", AndroidClog.getDevelopmentClog());
 }
 else {
   Clog.setCurrentProfile("prod", AndroidClog.getProductionClog());
-}</pre>
-
-  <p>In development, all logs will be directed to the standard Log implementations shown above, but in production, all logs will be discarded. You can replace the production log profile with implementations that write to file or send to Crashlytics if you need that instead.</p>
-
+}
+```
 
-</section>
+In development, all logs will be directed to the standard Log implementations shown above, but in production, all logs 
+will be discarded. You can replace the production log profile with implementations that write to file or send to 
+Crashlytics if you need that instead.